tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source
This commit is contained in:
David Yip
2018-03-27 10:44:12 -05:00
parent 49c957bc3b 3523aa440b
commit d2cdc2b5a3
18 changed files with 261 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/actions/accounts.js
View File

@@ -1,5 +1,5 @@
import api, { getLinks } from '../api';
import asyncDB from '../db/async';
import asyncDB from '../storage/db';
import { importAccount, importFetchedAccount, importFetchedAccounts } from './importer';
export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';

2
app/javascript/mastodon/actions/importer/index.js
View File

@@ -1,4 +1,4 @@
import { putAccounts, putStatuses } from '../../db/modifier';
import { putAccounts, putStatuses } from '../../storage/modifier';
import { normalizeAccount, normalizeStatus } from './normalizer';
export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT';

4
app/javascript/mastodon/actions/statuses.js
View File

@@ -1,6 +1,6 @@
import api from '../api';
import asyncDB from '../db/async';
import { evictStatus } from '../db/modifier';
import asyncDB from '../storage/db';
import { evictStatus } from '../storage/modifier';
import { deleteFromTimelines } from './timelines';
import { fetchStatusCard } from './cards';

93
app/javascript/mastodon/db/modifier.js
View File

@@ -1,93 +0,0 @@
import asyncDB from './async';
const limit = 1024;
function put(name, objects, callback) {
asyncDB.then(db => {
const putTransaction = db.transaction(name, 'readwrite');
const putStore = putTransaction.objectStore(name);
const putIndex = putStore.index('id');
objects.forEach(object => {
function add() {
putStore.add(object);
}
putIndex.getKey(object.id).onsuccess = retrieval => {
if (retrieval.target.result) {
putStore.delete(retrieval.target.result).onsuccess = add;
} else {
add();
}
};
});
putTransaction.oncomplete = () => {
const readTransaction = db.transaction(name, 'readonly');
const readStore = readTransaction.objectStore(name);
readStore.count().onsuccess = count => {
const excess = count.target.result - limit;
if (excess > 0) {
readStore.getAll(null, excess).onsuccess =
retrieval => callback(retrieval.target.result.map(({ id }) => id));
}
};
};
});
}
export function evictAccounts(ids) {
asyncDB.then(db => {
const transaction = db.transaction(['accounts', 'statuses'], 'readwrite');
const accounts = transaction.objectStore('accounts');
const accountsIdIndex = accounts.index('id');
const accountsMovedIndex = accounts.index('moved');
const statuses = transaction.objectStore('statuses');
const statusesIndex = statuses.index('account');
function evict(toEvict) {
toEvict.forEach(id => {
accountsMovedIndex.getAllKeys(id).onsuccess =
({ target }) => evict(target.result);
statusesIndex.getAll(id).onsuccess =
({ target }) => evictStatuses(target.result.map(({ id }) => id));
accountsIdIndex.getKey(id).onsuccess =
({ target }) => target.result && accounts.delete(target.result);
});
}
evict(ids);
});
}
export function evictStatus(id) {
return evictStatuses([id]);
}
export function evictStatuses(ids) {
asyncDB.then(db => {
const store = db.transaction('statuses', 'readwrite').objectStore('statuses');
const idIndex = store.index('id');
const reblogIndex = store.index('reblog');
ids.forEach(id => {
reblogIndex.getAllKeys(id).onsuccess =
({ target }) => target.result.forEach(reblogKey => store.delete(reblogKey));
idIndex.getKey(id).onsuccess =
({ target }) => target.result && store.delete(target.result);
});
});
}
export function putAccounts(records) {
put('accounts', records, evictAccounts);
}
export function putStatuses(records) {
put('statuses', records, evictStatuses);
}

2
app/javascript/mastodon/features/account_gallery/index.js
View File

@@ -67,7 +67,7 @@ export default class AccountGallery extends ImmutablePureComponent {
handleScrollToBottom = () => {
if (this.props.hasMore) {
this.handleLoadMore(this.props.medias.last().get('id'));
this.handleLoadMore(this.props.medias.last().getIn(['status', 'id']));
}
}

4
app/javascript/mastodon/reducers/notifications.js
View File

@@ -82,7 +82,7 @@ const expandNormalizedNotifications = (state, notifications, next) => {
};
const filterNotifications = (state, relationship) => {
return state.update('items', list => list.filterNot(item => item.get('account') === relationship.id));
return state.update('items', list => list.filterNot(item => item !== null && item.get('account') === relationship.id));
};
const updateTop = (state, top) => {
@@ -94,7 +94,7 @@ const updateTop = (state, top) => {
};
const deleteByStatus = (state, statusId) => {
return state.update('items', list => list.filterNot(item => item.get('status') === statusId));
return state.update('items', list => list.filterNot(item => item !== null && item.get('status') === statusId));
};
export default function notifications(state = initialState, action) {

30
app/javascript/mastodon/service_worker/entry.js
View File

@@ -1,6 +1,10 @@
import './web_push_notifications';
function openCache() {
function openSystemCache() {
return caches.open('mastodon-system');
}
function openWebCache() {
return caches.open('mastodon-web');
}
@@ -11,7 +15,7 @@ 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) {
event.waitUntil(Promise.all([openCache(), fetchRoot()]).then(([cache, root]) => cache.put('/', root)));
event.waitUntil(Promise.all([openWebCache(), fetchRoot()]).then(([cache, root]) => cache.put('/', root)));
});
self.addEventListener('activate', function(event) {
event.waitUntil(self.clients.claim());
@@ -21,7 +25,7 @@ self.addEventListener('fetch', function(event) {
if (url.pathname.startsWith('/web/')) {
const asyncResponse = fetchRoot();
const asyncCache = openCache();
const asyncCache = openWebCache();
event.respondWith(asyncResponse.then(async response => {
if (response.ok) {
@@ -31,10 +35,10 @@ self.addEventListener('fetch', function(event) {
}
throw null;
}).catch(() => caches.match('/')));
}).catch(() => asyncCache.then(cache => cache.match('/'))));
} else if (url.pathname === '/auth/sign_out') {
const asyncResponse = fetch(event.request);
const asyncCache = openCache();
const asyncCache = openWebCache();
event.respondWith(asyncResponse.then(async response => {
if (response.ok || response.type === 'opaqueredirect') {
@@ -44,5 +48,21 @@ self.addEventListener('fetch', function(event) {
return response;
}));
} else if (process.env.CDN_HOST ? url.host === process.env.CDN_HOST : url.pathname.startsWith('/system/')) {
event.respondWith(openSystemCache().then(async cache => {
const cached = await cache.match(event.request.url);
if (cached === undefined) {
const fetched = await fetch(event.request);
if (fetched.ok) {
await cache.put(event.request.url, fetched.clone());
}
return fetched;
}
return cached;
}));
}
});

0
app/javascript/mastodon/db/async.js → app/javascript/mastodon/storage/db.js
View File

151
app/javascript/mastodon/storage/modifier.js Normal file
View File

@@ -0,0 +1,151 @@
import asyncDB from './db';
import { autoPlayGif } from '../initial_state';
const accountAssetKeys = ['avatar', 'avatar_static', 'header', 'header_static'];
const avatarKey = autoPlayGif ? 'avatar' : 'avatar_static';
const limit = 1024;
const asyncCache = caches.open('mastodon-system');
function put(name, objects, onupdate, oncreate) {
return asyncDB.then(db => new Promise((resolve, reject) => {
const putTransaction = db.transaction(name, 'readwrite');
const putStore = putTransaction.objectStore(name);
const putIndex = putStore.index('id');
objects.forEach(object => {
putIndex.getKey(object.id).onsuccess = retrieval => {
function addObject() {
putStore.add(object);
}
function deleteObject() {
putStore.delete(retrieval.target.result).onsuccess = addObject;
}
if (retrieval.target.result) {
if (onupdate) {
onupdate(object, retrieval.target.result, putStore, deleteObject);
} else {
deleteObject();
}
} else {
if (oncreate) {
oncreate(object, addObject);
} else {
addObject();
}
}
};
});
putTransaction.oncomplete = () => {
const readTransaction = db.transaction(name, 'readonly');
const readStore = readTransaction.objectStore(name);
const count = readStore.count();
count.onsuccess = () => {
const excess = count.result - limit;
if (excess > 0) {
const retrieval = readStore.getAll(null, excess);
retrieval.onsuccess = () => resolve(retrieval.result);
retrieval.onerror = reject;
} else {
resolve([]);
}
};
count.onerror = reject;
};
putTransaction.onerror = reject;
}));
}
function evictAccountsByRecords(records) {
asyncDB.then(db => {
const transaction = db.transaction(['accounts', 'statuses'], 'readwrite');
const accounts = transaction.objectStore('accounts');
const accountsIdIndex = accounts.index('id');
const accountsMovedIndex = accounts.index('moved');
const statuses = transaction.objectStore('statuses');
const statusesIndex = statuses.index('account');
function evict(toEvict) {
toEvict.forEach(record => {
asyncCache.then(cache => accountAssetKeys.forEach(key => cache.delete(records[key])));
accountsMovedIndex.getAll(record.id).onsuccess = ({ target }) => evict(target.result);
statusesIndex.getAll(record.id).onsuccess =
({ target }) => evictStatusesByRecords(target.result);
accountsIdIndex.getKey(record.id).onsuccess =
({ target }) => target.result && accounts.delete(target.result);
});
}
evict(records);
});
}
export function evictStatus(id) {
return evictStatuses([id]);
}
export function evictStatuses(ids) {
asyncDB.then(db => {
const store = db.transaction('statuses', 'readwrite').objectStore('statuses');
const idIndex = store.index('id');
const reblogIndex = store.index('reblog');
ids.forEach(id => {
reblogIndex.getAllKeys(id).onsuccess =
({ target }) => target.result.forEach(reblogKey => store.delete(reblogKey));
idIndex.getKey(id).onsuccess =
({ target }) => target.result && store.delete(target.result);
});
});
}
function evictStatusesByRecords(records) {
evictStatuses(records.map(({ id }) => id));
}
export function putAccounts(records) {
const newURLs = [];
put('accounts', records, (newRecord, oldKey, store, oncomplete) => {
store.get(oldKey).onsuccess = ({ target }) => {
accountAssetKeys.forEach(key => {
const newURL = newRecord[key];
const oldURL = target.result[key];
if (newURL !== oldURL) {
asyncCache.then(cache => cache.delete(oldURL));
}
});
const newURL = newRecord[avatarKey];
const oldURL = target.result[avatarKey];
if (newURL !== oldURL) {
newURLs.push(newURL);
}
oncomplete();
};
}, (newRecord, oncomplete) => {
newURLs.push(newRecord[avatarKey]);
oncomplete();
}).then(records => {
evictAccountsByRecords(records);
asyncCache.then(cache => cache.addAll(newURLs));
});
}
export function putStatuses(records) {
put('statuses', records).then(evictStatusesByRecords);
}

17
app/javascript/styles/mastodon/components.scss
View File

@@ -3436,6 +3436,19 @@ a.status-card {
width: 100%;
height: 100%;
position: relative;
.extended-video-player {
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
video {
max-width: $media-modal-media-max-width;
max-height: $media-modal-media-max-height;
}
}
}
.media-modal__closer {
@@ -4411,8 +4424,8 @@ a.status-card {
border-radius: 4px;
video {
height: 100%;
width: 100%;
max-width: 100vw;
max-height: 80vh;
z-index: 1;
}