diff --git a/web/docker-compose.yml b/web/docker-compose.yml index f469e3e..216f4ea 100644 --- a/web/docker-compose.yml +++ b/web/docker-compose.yml @@ -1,12 +1,12 @@ version: "2" services: - social: + feedless: build: . restart: always network_mode: host env_file: .env volumes: - - social_ssb:/root/.social + - feedless_ssb:/root/.feedless volumes: - social_ssb: + feedless_ssb: diff --git a/web/lib/express.js b/web/lib/express.js index 6d4e1d0..c12dba6 100644 --- a/web/lib/express.js +++ b/web/lib/express.js @@ -278,7 +278,7 @@ router.post("/keys/email", async (req, res) => { sgMail.setApiKey(process.env.SENDGRID_API_KEY); const msg = { to: email, - from: "Social ", + from: "Feedless ", subject: `Login button for ${req.context.profile.name}`, html, }; diff --git a/web/lib/metrics.js b/web/lib/metrics.js index 4e5668e..4a1b876 100644 --- a/web/lib/metrics.js +++ b/web/lib/metrics.js @@ -9,36 +9,36 @@ const { Gauge, Summary, Counter } = prometheus; module.exports = { register, router: new Counter({ - name: "social_router", + name: "feedless_router", help: "Routes accessed by users", labelNames: ["method", "path"], }), ssbProgressRate: new Gauge({ - name: "social_ssb_progress_rate", + name: "feedless_ssb_progress_rate", help: "Tracks ssb syncing progress rate", }), ssbProgressFeeds: new Gauge({ - name: "social_ssb_progress_feeds", + name: "feedless_ssb_progress_feeds", help: "Tracks ssb syncing progress feeds", }), ssbProgressIncompleteFeeds: new Gauge({ - name: "social_ssb_progress_incomplete_feeds", + name: "feedless_ssb_progress_incomplete_feeds", help: "Tracks ssb syncing progress incomplete feeds", }), ssbProgressProgress: new Gauge({ - name: "social_ssb_progress_progress", + name: "feedless_ssb_progress_progress", help: "Tracks ssb syncing progress progress", }), ssbProgressTotal: new Gauge({ - name: "social_ssb_progress_total", + name: "feedless_ssb_progress_total", help: "Tracks ssb syncing progress total", }), searchResultsPeople: new Summary({ - name: "social_search_results_people", + name: "feedless_search_results_people", help: "Amount of people results returned from search", }), searchResultsCommunities: new Summary({ - name: "social_search_results_communities", + name: "feedless_search_results_communities", help: "Amount of communities results returned from search", }), }; diff --git a/web/lib/ssb-client.js b/web/lib/ssb-client.js index 467e29a..be7d12a 100644 --- a/web/lib/ssb-client.js +++ b/web/lib/ssb-client.js @@ -10,7 +10,7 @@ let ssbClient; let homeFolder = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE; let ssbSecret = ssbKeys.loadOrCreateSync( - `${homeFolder}/.${process.env.CONFIG_FOLDER || "social"}/secret` + `${homeFolder}/.${process.env.CONFIG_FOLDER || "feedless"}/secret` ); let syncing = false; diff --git a/web/lib/ssb-config.js b/web/lib/ssb-config.js index 718e80d..f44936f 100644 --- a/web/lib/ssb-config.js +++ b/web/lib/ssb-config.js @@ -1,6 +1,6 @@ const configInject = require("ssb-config/inject"); -module.exports = configInject(process.env.CONFIG_FOLDER || "social", { +module.exports = configInject(process.env.CONFIG_FOLDER || "feedless", { connections: { incoming: { net: [ diff --git a/web/lib/utils.js b/web/lib/utils.js index b2d53b1..21a80b3 100644 --- a/web/lib/utils.js +++ b/web/lib/utils.js @@ -55,7 +55,7 @@ module.exports.asyncRouter = (app) => { const ssbFolder = () => { let homeFolder = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE; - return `${homeFolder}/.${process.env.CONFIG_FOLDER || "social"}`; + return `${homeFolder}/.${process.env.CONFIG_FOLDER || "feedless"}`; }; module.exports.ssbFolder = ssbFolder; diff --git a/web/package-lock.json b/web/package-lock.json index 650406b..0d47228 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,5 +1,5 @@ { - "name": "social-app", + "name": "feedless-app", "version": "1.0.0", "lockfileVersion": 1, "requires": true, diff --git a/web/package.json b/web/package.json index 0712d1c..c6c64b6 100644 --- a/web/package.json +++ b/web/package.json @@ -1,14 +1,14 @@ { - "name": "social-app", + "name": "feedless-app", "version": "1.0.0", "description": "", "main": "index.js", "scripts": { "start": "MODE=server SSB_PORT=8009 node index.js", "start:client": "electron .", - "start:user-2": "SSB_PORT=8010 PORT=3001 CONFIG_FOLDER=social-user2 electron .", - "start:user-3": "SSB_PORT=8011 PORT=3002 CONFIG_FOLDER=social-user3 electron .", - "clear": "rm -rf ~/.social; rm -rf ~/.social-user2; rm -rf ~/.social-user3", + "start:user-2": "SSB_PORT=8010 PORT=3001 CONFIG_FOLDER=feedless-user2 electron .", + "start:user-3": "SSB_PORT=8011 PORT=3002 CONFIG_FOLDER=feedless-user3 electron .", + "clear": "rm -rf ~/.feedless; rm -rf ~/.feedless-user2; rm -rf ~/.feedless-user3", "package:mac": "electron-packager . --platform=darwin --arch=x64 --out out/ --overwrite", "package:linux": "electron-packager . --platform=linux --arch=x64 --out out/ --overwrite" }, diff --git a/web/views/desktop/_header.ejs b/web/views/desktop/_header.ejs index b1c24dd..f7195fb 100644 --- a/web/views/desktop/_header.ejs +++ b/web/views/desktop/_header.ejs @@ -3,7 +3,7 @@ - Social + Feedless @@ -11,7 +11,7 @@
<% if (context.profile && typeof hideHeader == "undefined") { %>