packages/backend/src/misc/grp.ts

@@ -1,14 +0,0 @@
-export type Grp = {
-	name: string;
-	host: string | null;
-};
-
-export function parse(grp: string): Grp {
-	if (grp.startsWith('+')) grp = grp.substr(1);
-	const split = grp.split('@', 2);
-	return { name: split[0], host: split[1] || null };
-}
-
-export function toString(grp: Grp): string {
-	return grp.host == null ? grp.name : `${grp.name}@${grp.host}`;
-}

packages/backend/src/remote/resolve-channel.ts

@@ -1,68 +0,0 @@
-import { URL } from 'node:url';
-import webFinger from './webfinger.js';
-import config from '@/config/index.js';
-import { createGroup, updateGroup } from './activitypub/models/group.js';
-import { remoteLogger } from './logger.js';
-import chalk from 'chalk';
-import { Channel } from '@/models/entities/channel.js';
-import { Channels } from '@/models/index.js';
-import { toPuny } from '@/misc/convert-host.js';
-import { IsNull } from 'typeorm';
-
-const logger = remoteLogger.createSubLogger('resolve');
-
-export async function resolveChannel(channelName: string, host: string | null): Promise<Channel> {
-	const nameLower = channelName.toLowerCase();
-
-	if (host == null) {
-		logger.info(`return local channel: ${nameLower}`);
-		return await Channels.findOneBy({ nameLower, host: IsNull() }).then(u => {
-			if (u == null) {
-				throw new Error('channel not found');
-			} else {
-				return u;
-			}
-		});
-	}
-
-	host = toPuny(host);
-
-	if (config.host === host) {
-		logger.info(`return local channel: ${nameLower}`);
-		return await Channels.findOneBy({ nameLower, host: IsNull() }).then(u => {
-			if (u == null) {
-				throw new Error('channel not found');
-			} else {
-				return u;
-			}
-		});
-	}
-
-	const channel = await Channels.findOneBy({ nameLower, host }) | null;
-
-	const identifier = `${nameLower}@${host}`;
-
-	if (channel == null) {
-		const self = await resolveSelf(identifier);
-
-		logger.succ(`return new remote channel: ${chalk.magenta(nameLower)}`);
-		return await createGroup(self.href);
-	}
-
-	logger.info(`return existing remote user: ${nameLower}`);
-	return channel;
-}
-
-async function resolveSelf(nameLower: string) {
-	logger.info(`WebFinger for ${chalk.yellow(nameLower)}`);
-	const finger = await webFinger(nameLower, 'grp').catch(e => {
-		logger.error(`Failed to WebFinger for ${chalk.yellow(nameLower)}: ${ e.statusCode || e.message }`);
-		throw new Error(`Failed to WebFinger for ${nameLower}: ${ e.statusCode || e.message }`);
-	});
-	const self = finger.links.find(link => link.rel != null && link.rel.toLowerCase() === 'self');
-	if (!self) {
-		logger.error(`Failed to WebFinger for ${chalk.yellow(nameLower)}: self link not found`);
-		throw new Error('self link not found');
-	}
-	return self;
-}

packages/backend/src/remote/resolve-user.ts

@@ -9,7 +9,7 @@ import { Users } from '@/models/index.js';
 import { toPuny } from '@/misc/convert-host.js';
 import { IsNull } from 'typeorm';
 
-const logger = remoteLogger.createSubLogger('resolve');
+const logger = remoteLogger.createSubLogger('resolve-user');
 
 export async function resolveUser(username: string, host: string | null): Promise<User> {
 	const usernameLower = username.toLowerCase();
@@ -98,7 +98,7 @@ export async function resolveUser(username: string, host: string | null): Promis
 
 async function resolveSelf(acctLower: string) {
 	logger.info(`WebFinger for ${chalk.yellow(acctLower)}`);
-	const finger = await webFinger(acctLower, 'acct').catch(e => {
+	const finger = await webFinger(acctLower).catch(e => {
 		logger.error(`Failed to WebFinger for ${chalk.yellow(acctLower)}: ${ e.statusCode || e.message }`);
 		throw new Error(`Failed to WebFinger for ${acctLower}: ${ e.statusCode || e.message }`);
 	});

packages/backend/src/remote/webfinger.ts

@@ -12,13 +12,13 @@ type IWebFinger = {
 	subject: string;
 };
 
-export default async function(query: string, schema: string): Promise<IWebFinger> {
-	const url = genUrl(query, schema);
+export default async function(query: string): Promise<IWebFinger> {
+	const url = genUrl(query);
 
 	return await getJson(url, 'application/jrd+json, application/json') as IWebFinger;
 }
 
-function genUrl(query: string, schema: string) {
+function genUrl(query: string) {
 	if (query.match(/^https?:\/\//)) {
 		const u = new URL(query);
 		return `${u.protocol}//${u.hostname}/.well-known/webfinger?` + urlQuery({ resource: query });
@@ -27,7 +27,7 @@ function genUrl(query: string, schema: string) {
 	const m = query.match(/^([^@]+)@(.*)/);
 	if (m) {
 		const hostname = m[2];
-		return `https://${hostname}/.well-known/webfinger?` + urlQuery({ resource: `${schema}:${query}` });
+		return `https://${hostname}/.well-known/webfinger?` + urlQuery({ resource: `acct:${query}` });
 	}
 
 	throw new Error(`Invalid query (${query})`);

packages/backend/src/server/api/endpoints/channels/show.ts

@@ -1,9 +1,6 @@
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { Channels } from '@/models/index.js';
-import { Channel } from '@/models/entities/channel.js';
-import { FindOptionsWhere, In, IsNull } from 'typeorm';
-import { resolveChannel } from '@/remote/resolve-channel.js';
 
 export const meta = {
 	tags: ['channels'],
@@ -17,13 +14,6 @@ export const meta = {
 	},
 
 	errors: {
-		failedToResolveRemoteChannel: {
-			message: 'Failed to resolve remote channel.',
-			code: 'FAILED_TO_RESOLVE_REMOTE_CHANNEL',
-			id: '701c2582-fd94-11ec-a43c-3c7c3f10cc28',
-			kind: 'server',
-		},
-
 		noSuchChannel: {
 			message: 'No such channel.',
 			code: 'NO_SUCH_CHANNEL',
@@ -34,25 +24,10 @@ export const meta = {
 
 export const paramDef = {
 	type: 'object',
-	anyOf: [
-		{
-			properties: {
-				channelId: { type: 'string', format: 'misskey:id' },
-			},
-			required: ['channelId'],
-		},
-		{
-			properties: {
-				channelName: { type: 'string' },
-				host: {
-					type: 'string',
-					nullable: true,
-					description: 'The local host is represented with `null`.',
-				},
-			},
-			required: ['channelName'],
-		},
-	],
+	properties: {
+		channelId: { type: 'string', format: 'misskey:id' },
+	},
+	required: ['channelId'],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
@@ -61,19 +36,6 @@ export default define(meta, paramDef, async (ps, me) => {
 		id: ps.channelId,
 	});
 
-	if (typeof ps.host === 'string' && typeof ps.channelName === 'string') {
-		user = await resolveChannel(ps.channelName, ps.host).catch(e => {
-			apiLogger.warn(`failed to resolve remote channel: ${e}`);
-			throw new ApiError(meta.errors.failedToResolveRemoteChannel);
-		});
-	} else {
-		const q: FindOptionsWhere<Channel> = ps.channelId != null
-			? { id: ps.channelId }
-			: { usernameLower: ps.username!.toLowerCase(), host: IsNull() };
-
-		user = await Channels.findOneBy(q);
-	}
-
 	if (channel == null) {
 		throw new ApiError(meta.errors.noSuchChannel);
 	}

packages/backend/src/server/web/index.ts

@@ -19,7 +19,6 @@ import { fetchMeta } from '@/misc/fetch-meta.js';
 import config from '@/config/index.js';
 import { Users, Notes, UserProfiles, Pages, Channels, Clips, GalleryPosts } from '@/models/index.js';
 import * as Acct from '@/misc/acct.js';
-import * as Grp from '@/misc/grp.js';
 import { getNoteSummary } from '@/misc/get-note-summary.js';
 import { queues } from '@/queue/queues.js';
 import { genOpenapiSpec } from '../api/openapi/gen-spec.js';
@@ -390,26 +389,9 @@ router.get('/gallery/:post', async (ctx, next) => {
 });
 
 // Channel
-router.get('/channels/:channel', async ctx => {
+router.get('/channels/:channel', async (ctx, next) => {
 	const channel = await Channels.findOneBy({
 		id: ctx.params.channel,
-		host: IsNull(),
-	});
-
-	if (channel == null) {
-		ctx.status = 404;
-		return;
-	}
-
-	ctx.redirect(`/+${channel.slug}${channel.host == null ? '' : '@' + channel.host}`);
-});
-
-router.get('/\\+:channel', async (ctx, next) => {
-	const { name, host } = Grp.parse(ctx.params.channel);
-
-	const channel = await Channels.findOneBy({
-		slug: name,
-		host: host ?? IsNull(),
 	});
 
 	if (channel) {

packages/backend/src/server/web/views/channel.pug

@@ -2,7 +2,7 @@ extends ./base
 
 block vars
 	- const title = channel.name;
-	- const url = `${config.url}/+${(channel.host ? `${channel.slug}@${channel.host}` : channel.slug)}`;
+	- const url = `${config.url}/channels/${channel.id}`;
 
 block title
 	= `${title} | ${instanceName}`

packages/backend/src/server/well-known.ts

@@ -2,12 +2,10 @@ import Router from '@koa/router';
 
 import config from '@/config/index.js';
 import * as Acct from '@/misc/acct.js';
-import * as Grp from '@/misc/grp.js';
 import { links } from './nodeinfo.js';
 import { escapeAttribute, escapeValue } from '@/prelude/xml.js';
-import { Users, Channels } from '@/models/index.js';
+import { Users } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
-import { Channel } from '@/models/entities/channel.js';
 import { FindOptionsWhere, IsNull } from 'typeorm';
 
 // Init router
@@ -68,132 +66,75 @@ router.get('/.well-known/change-password', async ctx => {
 });
 */
 
-const lookupUserById = (id: string) => {
-	const query = {
-		id,
-		host: IsNull(),
-		isSuspended: false,
-	} as FindOptionsWhere<User>;
-	return lookupUser(query);
-};
-
-const lookupUserByName = (resource: string) => {
-	const acct = Acct.parse(resource);
-	if (acct.host && acct.host !== config.host.toLowerCase()) {
-		return 422;
-	};
-	const query = {
-		usernameLower: acct.username,
-		host: IsNull(),
-		isSuspended: false,
-	} as FindOptionsWhere<User>;
-	return lookupUser(query);
-};
-
-const lookupUser = async (query: FindOptionsWhere<User>) => {
-		const user = await Users.findOneBy(query);
-
-		if (user == null) {
-			return 404;
-		}
-
-		const subject = `acct:${user.username}@${config.host}`;
-		const self = {
-			rel: 'self',
-			type: 'application/activity+json',
-			href: `${config.url}/users/${user.id}`,
-		};
-		const profilePage = {
-			rel: 'http://webfinger.net/rel/profile-page',
-			type: 'text/html',
-			href: `${config.url}/@${user.username}`,
-		};
-		const subscribe = {
-			rel: 'http://ostatus.org/schema/1.0/subscribe',
-			template: `${config.url}/authorize-follow?acct={uri}`,
-		};
-
-		return { subject, links: [self, profilePage, subscribe] };
-};
-
-
-const lookupChannelById = (id: string) => {
-	const query = {
-		id,
-		host: IsNull(),
-	} as FindOptionsWhere<Channel>;
-	return lookupChannel(query);
-};
-
-const lookupChannelByName = (resource: string) => {
-	const grp = Grp.parse(resource);
-	if (grp.host && grp.host !== config.host.toLowerCase()) {
-		return 422;
-	};
-	const query = {
-		slug: grp.name,
-		host: IsNull(),
-	} as FindOptionsWhere<Channel>;
-	return lookupChannel(query);
-};
-
-const lookupChannel = async (query: FindOptionsWhere<Channel>) => {
-		const channel = await Channels.findOneBy(query);
-
-		if (channel == null) {
-			return 404;
-		}
-
-		const subject = `grp:${channel.slug}@${config.host}`;
-		const self = {
-			rel: 'self',
-			type: 'application/activity+json',
-			href: `${config.url}/channel/${channel.id}`,
-		};
-		const profilePage = {
-			rel: 'http://webfinger.net/rel/profile-page',
-			type: 'text/html',
-			href: `${config.url}/+${channel.slug}`,
-		};
-
-		return { subject, links: [self, profilePage] };
-};
-
 router.get(webFingerPath, async ctx => {
+	const fromId = (id: User['id']): FindOptionsWhere<User> => ({
+		id,
+		host: IsNull(),
+		isSuspended: false,
+	});
+
+	const generateQuery = (resource: string): FindOptionsWhere<User> | number =>
+		resource.startsWith(`${config.url.toLowerCase()}/users/`) ?
+			fromId(resource.split('/').pop()!) :
+			fromAcct(Acct.parse(
+				resource.startsWith(`${config.url.toLowerCase()}/@`) ? resource.split('/').pop()! :
+				resource.startsWith('acct:') ? resource.slice('acct:'.length) :
+				resource));
+
+	const fromAcct = (acct: Acct.Acct): FindOptionsWhere<User> | number =>
+		!acct.host || acct.host === config.host.toLowerCase() ? {
+			usernameLower: acct.username,
+			host: IsNull(),
+			isSuspended: false,
+		} : 422;
+
 	if (typeof ctx.query.resource !== 'string') {
 		ctx.status = 400;
 		return;
 	}
 
-	const resource = ctx.query.resource.toLowerCase();
+	const query = generateQuery(ctx.query.resource.toLowerCase());
 
-	let elements: object | number;
-	if (resource.startsWith(`${config.url.toLowerCase()}/users/`) || resource.startsWith(`${config.url.toLowerCase()}/@`)) {
-		elements = await lookupUserById(resource.split('/').pop()!);
-	} else if (resource.startsWith('acct:')) {
-		elements = await lookupUserByName(resource.slice('acct:'.length));
-	} else if (resource.startsWith(`${config.url.toLowerCase()}/channel/`) || resource.startsWith(`${config.url.toLowerCase()}/+`)) {
-		elements = await lookupChannelById(resource.split('/').pop()!);
-	} else if (resource.startsWith('grp:')) {
-		elements = await lookupChannelByName(resource.slice('grp:'.length));
-	} else {
-		elements = 400;
-	}
-
-	if (typeof elements === 'number') {
-		ctx.status = elements;
+	if (typeof query === 'number') {
+		ctx.status = query;
 		return;
 	}
 
+	const user = await Users.findOneBy(query);
+
+	if (user == null) {
+		ctx.status = 404;
+		return;
+	}
+
+	const subject = `acct:${user.username}@${config.host}`;
+	const self = {
+		rel: 'self',
+		type: 'application/activity+json',
+		href: `${config.url}/users/${user.id}`,
+	};
+	const profilePage = {
+		rel: 'http://webfinger.net/rel/profile-page',
+		type: 'text/html',
+		href: `${config.url}/@${user.username}`,
+	};
+	const subscribe = {
+		rel: 'http://ostatus.org/schema/1.0/subscribe',
+		template: `${config.url}/authorize-follow?acct={uri}`,
+	};
+
 	if (ctx.accepts(jrd, xrd) === xrd) {
 		ctx.body = XRD(
-			{ element: 'Subject', value: elements.subject },
-			...elements.links.map((link) => ({
-				element: 'Link', attributes: link,
-			})));
+			{ element: 'Subject', value: subject },
+			{ element: 'Link', attributes: self },
+			{ element: 'Link', attributes: profilePage },
+			{ element: 'Link', attributes: subscribe });
 		ctx.type = xrd;
 	} else {
-		ctx.body = elements;
+		ctx.body = {
+			subject,
+			links: [self, profilePage, subscribe],
+		};
 		ctx.type = jrd;
 	}
 

packages/client/src/components/note.vue

@@ -70,7 +70,7 @@
 						<span>{{ i18n.ts.showMore }}</span>
 					</button>
 				</div>
-				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="channelPage(appearNote.channel)"><i class="fas fa-satellite-dish"></i> {{ appearNote.channel.name }}</MkA>
+				<MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="fas fa-satellite-dish"></i> {{ appearNote.channel.name }}</MkA>
 			</div>
 			<footer class="footer">
 				<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
@@ -122,7 +122,6 @@ import { pleaseLogin } from '@/scripts/please-login';
 import { focusPrev, focusNext } from '@/scripts/focus';
 import { checkWordMute } from '@/scripts/check-word-mute';
 import { userPage } from '@/filters/user';
-import { channelPage } from '@/filters/channel';
 import * as os from '@/os';
 import { defaultStore, noteViewInterruptors } from '@/store';
 import { reactionPicker } from '@/scripts/reaction-picker';

packages/client/src/filters/channel.ts

@@ -1,10 +0,0 @@
-import * as misskey from 'misskey-js';
-import { url } from '@/config';
-
-const normalize = (channel: misskey.entities.Channel) => {
-  return channel.host == null ? channel.slug : `${channel.slug}@${channel.host}`;
-};
-
-export const channelPage = (channel: misskey.entities.Channel, path?, absolute = false) => {
-	return `${absolute ? url : ''}/+${normalize(channel)}${(path ? `/${path}` : '')}`;
-};

packages/client/src/pages/channel.vue

@@ -46,7 +46,7 @@ export default defineComponent({
 	},
 
 	props: {
-		channelName: {
+		channelId: {
 			type: String,
 			required: true
 		}
@@ -80,7 +80,7 @@ export default defineComponent({
 		channelId: {
 			async handler() {
 				this.channel = await os.api('channels/show', {
-					channelName: this.channelName,
+					channelId: this.channelId,
 				});
 			},
 			immediate: true
@@ -117,12 +117,12 @@ export default defineComponent({
 		color: #fff;
 		background: rgba(0, 0, 0, 0.5);
 		border-radius: 100%;
-
+		
 		> i {
 			vertical-align: middle;
 		}
 	}
-
+	
 	> .banner {
 		position: relative;
 		height: 200px;

packages/client/src/router.ts

@@ -44,7 +44,7 @@ const defaultRoutes = [
 	{ path: '/channels', component: page('channels') },
 	{ path: '/channels/new', component: page('channel-editor') },
 	{ path: '/channels/:channelId/edit', component: page('channel-editor'), props: true },
-	{ path: '/+:channel', component: page('channel'), props: route => ({ channelName: route.params.channel }) },
+	{ path: '/channels/:channelId', component: page('channel'), props: route => ({ channelId: route.params.channelId }) },
 	{ path: '/clips/:clipId', component: page('clip'), props: route => ({ clipId: route.params.clipId }) },
 	{ path: '/timeline/list/:listId', component: page('user-list-timeline'), props: route => ({ listId: route.params.listId }) },
 	{ path: '/timeline/antenna/:antennaId', component: page('antenna-timeline'), props: route => ({ antennaId: route.params.antennaId }) },