Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream

Browse Source 
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.
This commit is contained in:
Claire
2026-02-11 13:32:18 +01:00
parent 8d1bf0dda5 d13d7b4566
commit 4fbd1ad7ae
41 changed files with 372 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
streaming/index.js
View File

@@ -376,6 +376,7 @@ const startServer = async () => {
req.scopes = result.rows[0].scopes.split(' ');
req.accountId = result.rows[0].account_id;
req.chosenLanguages = result.rows[0].chosen_languages;
req.permissions = result.rows[0].permissions;
return {
accessTokenId: result.rows[0].id,
@@ -601,13 +602,13 @@ const startServer = async () => {
/**
* @param {string} kind
* @param {ResolvedAccount} account
* @param {Request} req
* @returns {Promise.<{ localAccess: boolean, remoteAccess: boolean }>}
*/
const getFeedAccessSettings = async (kind, account) => {
const getFeedAccessSettings = async (kind, req) => {
const access = { localAccess: true, remoteAccess: true };
if (account.permissions & PERMISSION_VIEW_FEEDS) {
if (req.permissions & PERMISSION_VIEW_FEEDS) {
return access;
}