random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress on refactor

Browse Source 
Update files paths, components
This commit is contained in:
mgabdev
2020-01-29 16:53:33 -05:00
parent c0f0d4f07a
commit cb55ef9f04
99 changed files with 497 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/gabsocial/service_worker/entry.js
View File

@@ -18,13 +18,13 @@ function fetchRoot() {
// Cause a new version of a registered Service Worker to replace an existing one
// that is already installed, and replace the currently active worker on open pages.
self.addEventListener('install', function(event) {
self.addEventListener('install', function (event) {
event.waitUntil(Promise.all([openWebCache(), fetchRoot()]).then(([cache, root]) => cache.put('/', root)));
});
self.addEventListener('activate', function(event) {
self.addEventListener('activate', function (event) {
event.waitUntil(self.clients.claim());
});
self.addEventListener('fetch', function(event) {
self.addEventListener('fetch', function (event) {
const url = new URL(event.request.url);
if (url.pathname === '/auth/sign_out') {

8
app/javascript/gabsocial/service_worker/web_push_locales.js
View File

@@ -1,17 +1,17 @@
/* @preval */
const fs = require('fs');
const fs = require('fs');
const path = require('path');
const filtered = {};
const filtered = {};
const filenames = fs.readdirSync(path.resolve(__dirname, '../locales'));
filenames.forEach(filename => {
if (!filename.match(/\.json$/) || filename.match(/defaultMessages|whitelist/)) return;
const content = fs.readFileSync(path.resolve(__dirname, `../locales/${filename}`), 'utf-8');
const full = JSON.parse(content);
const locale = filename.split('.')[0];
const full = JSON.parse(content);
const locale = filename.split('.')[0];
filtered[locale] = {
'notification.favourite': full['notification.favourite'] || '',

32
app/javascript/gabsocial/service_worker/web_push_notifications.js
View File

@@ -28,8 +28,8 @@ const notify = options =>
const group = cloneNotification(notifications[0]);
group.title = formatMessage('notifications.group', options.data.preferred_locale, { count: group.data.count + 1 });
group.body = `${options.title}\n${group.body}`;
group.data = { ...group.data, count: group.data.count + 1 };
group.body = `${options.title}\n${group.body}`;
group.data = { ...group.data, count: group.data.count + 1 };
return self.registration.showNotification(group.title, group);
}
@@ -62,7 +62,7 @@ const cloneNotification = notification => {
let k;
// Object.assign() does not work with notifications
for(k in notification) {
for (k in notification) {
clone[k] = notification[k];
}
@@ -83,24 +83,24 @@ const handlePush = (event) => {
fetchFromApi(`/api/v1/notifications/${notification_id}`, 'get', access_token).then(notification => {
const options = {};
options.title = formatMessage(`notification.${notification.type}`, preferred_locale, { name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username });
options.body = notification.status && htmlToPlainText(notification.status.content);
options.icon = notification.account.avatar_static;
options.title = formatMessage(`notification.${notification.type}`, preferred_locale, { name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username });
options.body = notification.status && htmlToPlainText(notification.status.content);
options.icon = notification.account.avatar_static;
options.timestamp = notification.created_at && new Date(notification.created_at);
options.tag = notification.id;
options.badge = '/badge.png';
options.image = notification.status && notification.status.media_attachments.length > 0 && notification.status.media_attachments[0].preview_url || undefined;
options.data = { access_token, preferred_locale, id: notification.status ? notification.status.id : notification.account.id, url: notification.status ? `/${notification.account.username}/posts/${notification.status.id}` : `/${notification.account.username}` };
options.tag = notification.id;
options.badge = '/badge.png';
options.image = notification.status && notification.status.media_attachments.length > 0 && notification.status.media_attachments[0].preview_url || undefined;
options.data = { access_token, preferred_locale, id: notification.status ? notification.status.id : notification.account.id, url: notification.status ? `/${notification.account.username}/posts/${notification.status.id}` : `/${notification.account.username}` };
if (notification.status && notification.status.spoiler_text || notification.status.sensitive) {
options.data.hiddenBody = htmlToPlainText(notification.status.content);
options.data.hiddenBody = htmlToPlainText(notification.status.content);
options.data.hiddenImage = notification.status.media_attachments.length > 0 && notification.status.media_attachments[0].preview_url;
if (notification.status.spoiler_text) {
options.body = notification.status.spoiler_text;
options.body = notification.status.spoiler_text;
}
options.image = undefined;
options.image = undefined;
options.actions = [actionExpand(preferred_locale)];
} else if (notification.type === 'mention') {
options.actions = [actionReblog(preferred_locale), actionFavourite(preferred_locale)];
@@ -149,8 +149,8 @@ const findBestClient = clients => {
const expandNotification = notification => {
const newNotification = cloneNotification(notification);
newNotification.body = newNotification.data.hiddenBody;
newNotification.image = newNotification.data.hiddenImage;
newNotification.body = newNotification.data.hiddenBody;
newNotification.image = newNotification.data.hiddenImage;
newNotification.actions = [actionReblog(notification.data.preferred_locale), actionFavourite(notification.data.preferred_locale)];
return self.registration.showNotification(newNotification.title, newNotification);
@@ -171,7 +171,7 @@ const openUrl = url =>
const webClients = clientList.filter(client => /\//.test(client.url));
if (webClients.length !== 0) {
const client = findBestClient(webClients);
const client = findBestClient(webClients);
const { pathname } = new URL(url, self.location);
// : TODO :