Merge commit from fork

This commit is contained in:
Emelia Smith 2025-10-13 14:20:57 +02:00 committed by GitHub
parent 40b619a916
commit 68de818b86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -152,17 +152,6 @@ const redisConfigFromEnv = (env) => {
};
};
const PUBLIC_CHANNELS = [
'public',
'public:media',
'public:local',
'public:local:media',
'public:remote',
'public:remote:media',
'hashtag',
'hashtag:local',
];
// Used for priming the counters/gauges for the various metrics that are
// per-channel
const CHANNEL_NAMES = [
@ -171,7 +160,14 @@ const CHANNEL_NAMES = [
'user:notification',
'list',
'direct',
...PUBLIC_CHANNELS
'public',
'public:media',
'public:local',
'public:local:media',
'public:remote',
'public:remote:media',
'hashtag',
'hashtag:local'
];
const startServer = async () => {
@ -548,12 +544,6 @@ const startServer = async () => {
const checkScopes = (req, channelName) => new Promise((resolve, reject) => {
log.silly(req.requestId, `Checking OAuth scopes for ${channelName}`);
// When accessing public channels, no scopes are needed
if (PUBLIC_CHANNELS.includes(channelName)) {
resolve();
return;
}
// The `read` scope has the highest priority, if the token has it
// then it can access all streams
const requiredScopes = ['read'];