Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion src/mappers/FeedMapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,24 @@ export default class FeedMapper extends AbstractMapper<FeedDto> {
get: ["manageFeed"],
set: ["none"],
},
interval: {
type: "integer",
label: "Interval",
get: ["manageFeed"],
set: ["manageFeed"],
},
platforms: {
type: "string[]",
label: "Active platforms",
get: ["manageFeed"],
set: ["none"],
},
connected: {
type: "string[]",
label: "Connected platforms",
get: ["manageFeed"],
set: ["none"],
},
sources: {
type: "string[]",
label: "Feed sources",
Expand Down Expand Up @@ -62,6 +80,19 @@ export default class FeedMapper extends AbstractMapper<FeedDto> {
case "path":
dto[field] = this.feed.path;
break;
case "interval":
dto[field] = Number(this.user.data.get("settings", "FEED_INTERVAL"));
break;
case "platforms":
dto[field] = this.user.data
.get("settings", "FEED_PLATFORMS")
.split(",");
break;
case "connected":
dto[field] = this.user.data
.get("settings", "FEED_CONNECTED")
.split(",");
break;
case "sources":
dto[field] = (await this.feed.getSources()).map((s) => s.id);
break;
Expand All @@ -80,7 +111,14 @@ export default class FeedMapper extends AbstractMapper<FeedDto> {
const fields = this.getDtoFields(operator, "set");
for (const field in dto) {
if (fields.includes(field)) {
// there are no settable fields
switch (field) {
case "interval":
const interval = Number(
dto[field] || process.env.FAIRPOST_FEED_INTERVAL,
);
this.user.data.set("settings", "FEED_INTERVAL", String(interval));
break;
}
} else {
this.user.log.trace("Ignoring field: " + field);
}
Expand Down
22 changes: 20 additions & 2 deletions src/mappers/UserMapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,21 @@ export default class UserMapper extends AbstractMapper<UserDto> {
homedir: {
type: "string",
label: "Home directory",
get: ["manageUsers"],
get: ["manageAccount"],
set: ["none"],
required: false,
},
is_public: {
type: "boolean",
label: "Show my profile in public",
get: ["manageAccount"],
set: ["manageAccount"],
required: false,
},
loglevel: {
type: "string",
label: "Logger level",
get: ["manageUsers"],
get: ["manageAccount"],
set: ["manageUsers"],
required: false,
},
Expand Down Expand Up @@ -56,6 +63,9 @@ export default class UserMapper extends AbstractMapper<UserDto> {
case "homedir":
dto[field] = this.user.homedir;
break;
case "is_public":
dto[field] = this.user.data.get("settings", "IS_PUBLIC") === "true";
break;
case "loglevel":
dto[field] = this.user.data.get("settings", "LOGGER_LEVEL");
break;
Expand All @@ -64,6 +74,7 @@ export default class UserMapper extends AbstractMapper<UserDto> {
break;
}
}

return dto;
}

Expand All @@ -78,6 +89,13 @@ export default class UserMapper extends AbstractMapper<UserDto> {
for (const field in dto) {
if (fields.includes(field)) {
switch (field) {
case "is_public":
this.user.data.set(
"settings",
"IS_PUBLIC",
dto[field] ? "true" : "false",
);
break;
case "loglevel":
this.user.data.set(
"settings",
Expand Down
3 changes: 3 additions & 0 deletions src/types/FeedDto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@ export default interface FeedDto {
id: string;
user_id: string;
path?: string;
interval?: number;
platforms?: string[];
connected?: string[];
sources?: string[];
}
1 change: 1 addition & 0 deletions src/types/UserDto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export default interface UserDto {
model: string;
id: string;
homedir?: string;
is_public?: boolean;
loglevel?: string;
report?: UserReport;
}
Loading