heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

switch to egirlskey branding

Browse source
This commit is contained in:
jaina heartles 2024-09-22 18:51:30 -04:00
parent 91ec6c3a14
commit eb05c2e619
53 changed files with 300 additions and 968 deletions
Download patch file Download diff file Expand all files Collapse all files

16
packages/backend/migration/1727044684877-addEgirlskeyUrls.js Normal file
View file

@ -0,0 +1,16 @@
export class AddEgirlskeyUrls1727044684877 {
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://gitdab.com/heartles/egirlskey/'`);
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://gitdab.com/heartles/egirlskey/issues/new'`);
await queryRunner.query(`UPDATE "meta" SET "repositoryUrl"=DEFAULT WHERE "repositoryUrl" IN ('https://activitypub.software/TransFem-org/Sharkey/','https://git.joinsharkey.org/Sharkey/Sharkey','https://github.com/transfem-org/sharkey','https://github.com/misskey-dev/misskey')`);
await queryRunner.query(`UPDATE "meta" SET "feedbackUrl"=DEFAULT WHERE "feedbackUrl" IN ('https://activitypub.software/TransFem-org/Sharkey/-/issues/new', 'https://git.joinsharkey.org/Sharkey/Sharkey/issues/new/choose','https://github.com/transfem-org/sharkey/issues/new','https://github.com/misskey-dev/misskey/issues/new')`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://activitypub.software/TransFem-org/Sharkey/'`);
await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://activitypub.software/TransFem-org/Sharkey/-/issues/new'`);
await queryRunner.query(`UPDATE "meta" SET "repositoryUrl"=DEFAULT WHERE "repositoryUrl" IN ('https://gitdab.com/heartles/egirlskey/','https://git.joinsharkey.org/Sharkey/Sharkey','https://github.com/transfem-org/sharkey','https://github.com/misskey-dev/misskey')`);
await queryRunner.query(`UPDATE "meta" SET "feedbackUrl"=DEFAULT WHERE "feedbackUrl" IN ('https://gitdab.com/heartles/egirlskey/issues/new','https://git.joinsharkey.org/Sharkey/Sharkey/issues/new/choose','https://github.com/transfem-org/sharkey/issues/new','https://github.com/misskey-dev/misskey/issues/new')`);
}
}

26
packages/backend/src/boot/master.ts
View file

@ -33,25 +33,25 @@ function greet() {
if (!envOption.quiet) {
//#region Misskey logo
const v = `v${meta.version}`;
console.log(themeColor(' _____ _ _ '));
console.log(themeColor('/ ___| | | | '));
console.log(themeColor('\ `--.| |__ __ _ _ __| | _____ _ _ '));
console.log(themeColor(" `--. \ '_ \ / _` | '__| |/ / _ \ | | |"));
console.log(themeColor('/\__/ / | | | (_| | | | < __/ |_| |'));
console.log(themeColor('\____/|_| |_|\__,_|_| |_|\_\___|\__, |'));
console.log(themeColor(' __/ |'));
console.log(themeColor(' |___/ '));
console.log(themeColor(" _____ _ _ _ "));
console.log(themeColor(" | __ (_) | | | | "));
console.log(themeColor(" ___| | \/_ _ __| |___| | _____ _ _ "));
console.log(themeColor(" / _ \ | __| | '__| / __| |/ / _ \ | | |"));
console.log(themeColor("| __/ |_\ \ | | | \__ \ < __/ |_| |"));
console.log(themeColor(" \___|\____/_|_| |_|___/_|\_\___|\__, |"));
console.log(themeColor(" __/ |"));
console.log(themeColor(" |___/ "));
//#endregion
console.log(' Sharkey is an open-source decentralized microblogging platform.');
console.log(chalk.rgb(255, 136, 0)(' If you like Sharkey, please donate to support development. https://opencollective.com/sharkey'));
console.log(' eGirlskey is an open-source decentralized microblogging platform.');
console.log(chalk.rgb(255, 136, 0)(' If you like eGirlskey, please donate to support development. https://heartles.xyz'));
console.log('');
console.log(chalkTemplate`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`);
}
bootLogger.info('Welcome to Sharkey!');
bootLogger.info(`Sharkey v${meta.version}`, null, true);
bootLogger.info('Welcome to eGirlskey!');
bootLogger.info(`eGirlskey v${meta.version}`, null, true);
}
/**
@ -74,7 +74,7 @@ export async function masterMain() {
process.exit(1);
}
bootLogger.succ('Sharkey initialized');
bootLogger.succ('eGirlskey initialized');
if (config.sentryForBackend) {
Sentry.init({

4
packages/backend/src/models/Meta.ts
View file

@ -388,14 +388,14 @@ export class MiMeta {
@Column('varchar', {
length: 1024,
default: 'https://activitypub.software/TransFem-org/Sharkey/',
default: 'https://gitdab.com/heartles/egirlskey/',
nullable: false,
})
public repositoryUrl: string | null;
@Column('varchar', {
length: 1024,
default: 'https://activitypub.software/TransFem-org/Sharkey/-/issues/new',
default: 'https://gitdab.com/heartles/egirlskey/issues/new',
nullable: true,
})
public feedbackUrl: string | null;

2
packages/backend/src/server/NodeinfoServerService.ts
View file

@ -76,7 +76,7 @@ export class NodeinfoServerService {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const document: any = {
software: {
name: 'sharkey',
name: 'egirlskey',
version: this.config.version,
homepage: nodeinfo_homepage,
repository: meta.repositoryUrl,

4
packages/backend/src/server/api/endpoints/sponsors.ts
View file

@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['meta'],
description: 'Get Sharkey GH Sponsors',
description: 'Get eGirlskey GH Sponsors',
requireCredential: false,
requireCredentialSecureMode: false,
@ -43,7 +43,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
};
try {
sponsors = await fetch('https://kaifa.ch/transfem-sponsors.json', { signal: AbortSignal.timeout(2000) })
sponsors = await fetch('https://heartles.xyz/egirls-sponsors.json', { signal: AbortSignal.timeout(2000) })
.then((response) => response.json());
await this.redisClient.set('sponsors', JSON.stringify(sponsors), 'EX', 3600);

8
packages/backend/src/server/api/mastodon/endpoints/meta.ts
View file

@ -16,14 +16,14 @@ export async function getInstance(
) {
return {
uri: config.url,
title: meta.name || 'Sharkey',
title: meta.name || 'eGirlskey',
short_description:
meta.description || 'This is a vanilla Sharkey Instance. It doesn\'t seem to have a description.',
meta.description || 'This is a vanilla eGirlskey Instance. It doesn\'t seem to have a description.',
description:
meta.description ||
'This is a vanilla Sharkey Instance. It doesn\'t seem to have a description.',
'This is a vanilla eGirlskey Instance. It doesn\'t seem to have a description.',
email: response.email || '',
version: `3.0.0 (compatible; Sharkey ${config.version})`,
version: `3.0.0 (compatible; eGirlskey ${config.version})`,
urls: response.urls,
stats: {
user_count: response.stats.user_count,

4
packages/backend/src/server/api/openapi/gen-spec.ts
View file

@ -19,7 +19,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) {
externalDocs: {
description: 'Repository',
url: 'https://activitypub.software/TransFem-org/Sharkey',
url: 'https://gitdab.com/heartles/egirlskey',
},
servers: [{
@ -97,7 +97,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) {
description: desc,
externalDocs: {
description: 'Source code',
url: `https://activitypub.software/TransFem-org/Sharkey/-/tree/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,
url: `https://gitdab.com/heartles/egirlskey/-/tree/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`,
},
...(endpoint.meta.tags ? {
tags: [endpoint.meta.tags[0]],

4
packages/backend/src/server/web/ClientServerService.ts
View file

@ -189,7 +189,7 @@ export class ClientServerService {
@bindThis
private async generateCommonPugData(meta: MiMeta) {
return {
instanceName: meta.name ?? 'Sharkey',
instanceName: meta.name ?? 'eGirlskey',
icon: meta.iconUrl,
appleTouchIcon: meta.app512IconUrl,
themeColor: meta.themeColor,
@ -451,7 +451,7 @@ export class ClientServerService {
fastify.get('/opensearch.xml', async (request, reply) => {
const meta = await this.metaService.fetch();
const name = meta.name ?? 'Sharkey';
const name = meta.name ?? 'eGirlskey';
let content = '';
content += '<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">';
content += `<ShortName>${name}</ShortName>`;

2
packages/backend/src/server/web/FeedService.ts
View file

@ -62,7 +62,7 @@ export class FeedService {
id: author.link,
title: `${author.name} (@${user.username}@${this.config.host})`,
updated: notes.length !== 0 ? this.idService.parse(notes[0].id).date : undefined,
generator: 'Sharkey',
generator: 'eGirlskey',
description: `${user.notesCount} Notes, ${profile.followingVisibility === 'public' ? user.followingCount : '?'} Following, ${profile.followersVisibility === 'public' ? user.followersCount : '?'} Followers${profile.description ? ` · ${profile.description}` : ''}`,
link: author.link,
image: user.avatarUrl ?? this.userEntityService.getIdenticonUrl(user),

2
packages/backend/src/server/web/boot.js
View file

@ -245,7 +245,7 @@
font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
}
#sharkey_app,
#egirlskey_app,
#splash {
display: none !important;
}

2
packages/backend/src/server/web/error.css
View file

@ -8,7 +8,7 @@
font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
}
#sharkey_app,
#egirlskey_app,
#splash {
display: none !important;
}

4
packages/backend/src/server/web/manifest.json
View file

@ -1,6 +1,6 @@
{
"short_name": "Sharkey",
"name": "Sharkey",
"short_name": "eGirlskey",
"name": "eGirlskey",
"start_url": "/",
"display": "standalone",
"background_color": "#313a42",

31
packages/backend/src/server/web/views/base.pug
View file

@ -7,36 +7,35 @@ doctype html
//
-
_____ _ _
/ ___| | | |
\ `--.| |__ __ _ _ __| | _____ _ _
`--. \ '_ \ / _` | '__| |/ / _ \ | | |
/\__/ / | | | (_| | | | < __/ |_| |
\____/|_| |_|\__,_|_| |_|\_\___|\__, |
__/ |
|___/
Thank you for using Sharkey!
_____ _ _ _
| __ (_) | | | |
___| | \/_ _ __| |___| | _____ _ _
/ _ \ | __| | '__| / __| |/ / _ \ | | |
| __/ |_\ \ | | | \__ \ < __/ |_| |
\___|\____/_|_| |_|___/_|\_\___|\__, |
__/ |
|___/
Thank you for using eGirlskey!
If you are reading this message... how about joining the development?
https://activitypub.software/TransFem-org/Sharkey
https://gitdab.com/heartles/egirlskey
html
head
meta(charset='utf-8')
meta(name='application-name' content='Sharkey')
meta(name='application-name' content='eGirlskey')
meta(name='referrer' content='origin')
meta(name='theme-color' content= themeColor || '#86b300')
meta(name='theme-color-orig' content= themeColor || '#86b300')
meta(property='og:site_name' content= instanceName || 'Sharkey')
meta(property='og:site_name' content= instanceName || 'eGirlskey')
meta(property='instance_url' content= instanceUrl)
meta(name='viewport' content='width=device-width, initial-scale=1')
meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no')
link(rel='icon' href= icon || '/favicon.ico')
link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png')
link(rel='manifest' href='/manifest.json')
link(rel='search' type='application/opensearchdescription+xml' title=(title || "Sharkey") href=`${url}/opensearch.xml`)
link(rel='search' type='application/opensearchdescription+xml' title=(title || "eGirlskey") href=`${url}/opensearch.xml`)
link(rel='prefetch' href=serverErrorImageUrl)
link(rel='prefetch' href=infoImageUrl)
link(rel='prefetch' href=notFoundImageUrl)
@ -54,7 +53,7 @@ html
title
block title
= title || 'Sharkey'
= title || 'eGirlskey'
if noindex
meta(name='robots' content='noindex')
@ -65,7 +64,7 @@ html
block meta
block og
meta(property='og:title' content= title || 'Sharkey')
meta(property='og:title' content= title || 'eGirlskey')
meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨')
meta(property='og:image' content= img)
meta(property='twitter:card' content='summary')

6
packages/backend/src/server/web/views/bios.pug
View file

@ -4,8 +4,8 @@ html
head
meta(charset='utf-8')
meta(name='application-name' content='Sharkey')
title Sharkey Repair Tool
meta(name='application-name' content='eGirlskey')
title eGirlskey Repair Tool
style
include ../bios.css
script
@ -13,7 +13,7 @@ html
body
header
h1 Sharkey Repair Tool #{version}
h1 eGirlskey Repair Tool #{version}
main
div.tabs
button#ls edit local storage

6
packages/backend/src/server/web/views/cli.pug
View file

@ -4,8 +4,8 @@ html
head
meta(charset='utf-8')
meta(name='application-name' content='Sharkey')
title Sharkey Cli
meta(name='application-name' content='eGirlskey')
title eGirlskey Cli
style
include ../cli.css
script
@ -13,7 +13,7 @@ html
body
header
h1 Sharkey Cli #{version}
h1 eGirlskey Cli #{version}
main
div#form
textarea#text

26
packages/backend/src/server/web/views/error.pug
View file

@ -2,31 +2,29 @@ doctype html
//
-
_____ _ _
/ ___| | | |
\ `--.| |__ __ _ _ __| | _____ _ _
`--. \ '_ \ / _` | '__| |/ / _ \ | | |
/\__/ / | | | (_| | | | < __/ |_| |
\____/|_| |_|\__,_|_| |_|\_\___|\__, |
__/ |
|___/
Thank you for using Sharkey!
_____ _ _ _
| __ (_) | | | |
___| | \/_ _ __| |___| | _____ _ _
/ _ \ | __| | '__| / __| |/ / _ \ | | |
| __/ |_\ \ | | | \__ \ < __/ |_| |
\___|\____/_|_| |_|___/_|\_\___|\__, |
__/ |
|___/
Thank you for using eGirlskey!
If you are reading this message... how about joining the development?
https://activitypub.software/TransFem-org/Sharkey
https://gitdab.com/heartles/egirlskey
html
head
meta(charset='utf-8')
meta(name='viewport' content='width=device-width, initial-scale=1')
meta(name='application-name' content='Sharkey')
meta(name='application-name' content='eGirlskey')
meta(name='referrer' content='origin')
title
block title
= 'An error has occurred... | Sharkey'
= 'An error has occurred... | eGirlskey'
style
include ../error.css

2
packages/backend/src/server/web/views/flush.pug
View file

@ -4,7 +4,7 @@ html
#msg
script.
const msg = document.getElementById('msg');
const successText = `\nSuccess Flush! <a href="/">Back to Sharkey</a>\n成功しました。<a href="/">Sharkeyを開き直してください。</a>`;
const successText = `\nSuccess Flush! <a href="/">Back to eGirlskey</a>\n成功しました。<a href="/">eGirlskeyを開き直してください。</a>`;
message('Start flushing.');

2
packages/backend/src/server/web/views/info-card.pug
View file

@ -4,7 +4,7 @@ html
head
meta(charset='utf-8')
meta(name='application-name' content='Sharkey')
meta(name='application-name' content='eGirlskey')
title= meta.name || host
style.
html, body {