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 {

4
packages/frontend/src/boot/common.ts
View file

@ -25,7 +25,7 @@ import { fetchCustomEmojis } from '@/custom-emojis.js';
import { setupRouter } from '@/router/definition.js';
export async function common(createVue: () => App<Element>) {
console.info(`Sharkey v${version}`);
console.info(`eGirlskey v${version}`);
if (_DEV_) {
console.warn('Development mode!!!');
@ -256,7 +256,7 @@ export async function common(createVue: () => App<Element>) {
// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
// なぜか2回実行されることがあるため、mountするdivを1つに制限する
const rootEl = ((): HTMLElement => {
const MISSKEY_MOUNT_DIV_ID = 'sharkey_app';
const MISSKEY_MOUNT_DIV_ID = 'egirlskey_app';
const currentRoot = document.getElementById(MISSKEY_MOUNT_DIV_ID);

2
packages/frontend/src/boot/main-boot.ts
View file

@ -254,7 +254,7 @@ export async function mainBoot() {
}
const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read');
if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://activitypub.software/TransFem-org/Sharkey/') {
if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://gitdab.com/heartles/egirlskey/') {
const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, {
closed: () => dispose(),
});

2
packages/frontend/src/components/MkDonation.vue
View file

@ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
</I18n>
<div style="margin-top: 0.2em;">
<MkLink target="_blank" url="https://opencollective.com/sharkey">{{ i18n.ts.learnMore }}</MkLink>
<MkLink target="_blank" url="https://heartles.xyz">{{ i18n.ts.learnMore }}</MkLink>
</div>
</div>
<div v-if="instance.donationUrl" :class="$style.text">

2
packages/frontend/src/components/MkPostForm.vue
View file

@ -920,7 +920,7 @@ async function post(ev?: MouseEvent) {
const text = postData.text ?? '';
const lowerCase = text.toLowerCase();
if ((lowerCase.includes('love') || lowerCase.includes('❤')) && lowerCase.includes('sharkey')) {
if ((lowerCase.includes('love') || lowerCase.includes('❤')) && lowerCase.includes('egirlskey')) {
claimAchievement('iLoveMisskey');
}
if ([

2
packages/frontend/src/components/MkSignupDialog.rules.vue
View file

@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>{{ i18n.ts.basicNotesBeforeCreateAccount }}</template>
<template #suffix><i v-if="agreeNote" class="ti ti-check" style="color: var(--success)"></i></template>
<a href="https://activitypub.software/TransFem-org/Sharkey/-/blob/stable/IMPORTANT_NOTES.md" class="_link" target="_blank">{{ i18n.ts.basicNotesBeforeCreateAccount }} <i class="ti ti-external-link"></i></a>
<a href="https://gitdab.com/heartles/egirlskey/-/blob/stable/IMPORTANT_NOTES.md" class="_link" target="_blank">{{ i18n.ts.basicNotesBeforeCreateAccount }} <i class="ti ti-external-link"></i></a>
<MkSwitch :modelValue="agreeNote" style="margin-top: 16px;" data-cy-signup-rules-notes-agree @update:modelValue="updateAgreeNote">{{ i18n.ts.agree }}</MkSwitch>
</MkFolder>

2
packages/frontend/src/components/MkSourceCodeAvailablePopup.vue
View file

@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</I18n>
<I18n :src="i18n.ts.correspondingSourceIsAvailable" tag="span">
<template #anchor>
<MkA to="/about-sharkey" class="_link">{{ i18n.ts.aboutMisskey }}</MkA>
<MkA to="/about-egirlskey" class="_link">{{ i18n.ts.aboutMisskey }}</MkA>
</template>
</I18n>
</div>

2
packages/frontend/src/components/MkUpdated.vue
View file

@ -27,7 +27,7 @@ const modal = shallowRef<InstanceType<typeof MkModal>>();
const whatIsNew = () => {
modal.value?.close();
window.open(`https://activitypub.software/TransFem-org/Sharkey/-/releases/${version}`, '_blank');
window.open(`https://gitdab.com/heartles/egirlskey/-/releases/${version}`, '_blank');
};
onMounted(() => {

2
packages/frontend/src/components/MkVisitorDashboard.vue
View file

@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</div>
<div class="_gaps_s" :class="$style.mainActions">
<MkButton :class="$style.mainAction" full rounded gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ i18n.ts.joinThisServer }}</MkButton>
<MkButton :class="$style.mainAction" full rounded link to="https://joinsharkey.org/#findaninstance">{{ i18n.ts.exploreOtherServers }}</MkButton>
<!--<MkButton :class="$style.mainAction" full rounded link to="https://joinsharkey.org/#findaninstance">{{ i18n.ts.exploreOtherServers }}</MkButton>-->
<MkButton :class="$style.mainAction" full rounded data-cy-signin @click="signin()">{{ i18n.ts.login }}</MkButton>
</div>
</div>

2
packages/frontend/src/config.ts
View file

@ -18,7 +18,7 @@ export const langs = _LANGS_;
const preParseLocale = miLocalStorage.getItem('locale');
export let locale = preParseLocale ? JSON.parse(preParseLocale) : null;
export const version = _VERSION_;
export const instanceName = siteName === 'Sharkey' || siteName == null ? host : siteName;
export const instanceName = siteName === 'eGirlskey' || siteName == null ? host : siteName;
export const ui = miLocalStorage.getItem('ui');
export const debug = miLocalStorage.getItem('debug') === 'true';

2
packages/frontend/src/index.html
View file

@ -31,7 +31,7 @@
</head>
<body>
<div id="sharkey_app"></div>
<div id="egirlskey_app"></div>
<script type="module" src="./_dev_boot_.ts"></script>
</body>
</html>

30
packages/frontend/src/pages/about-sharkey.vue → packages/frontend/src/pages/about-egirlskey.vue
View file

@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div v-panel class="about">
<div ref="containerEl" class="container" :class="{ playing: easterEggEngine != null }">
<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
<div class="misskey">Sharkey</div>
<div class="misskey">eGirlskey</div>
<div class="version">v{{ version }}</div>
<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }">
<MkCustomEmoji v-if="emoji.emoji[0] === ':'" class="emoji" :name="emoji.emoji" :normal="true" :noStyle="true" :fallbackToImage="true"/>
@ -22,12 +22,12 @@ SPDX-License-Identifier: AGPL-3.0-only
<button v-if="thereIsTreasure" class="_button treasure" @click="getTreasure"><img src="/fluent-emoji/1f3c6.png" class="treasureImg"></button>
</div>
<div style="text-align: center;">
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://joinsharkey.org/" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
{{ i18n.ts._aboutMisskey.about }}<br><a href="https://gitdab.com/heartles/egirlskey" target="_blank" class="_link">{{ i18n.ts.learnMore }}</a>
</div>
<div v-if="$i != null" style="text-align: center;">
<MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #Sharkey</MkButton>
<MkButton primary rounded inline @click="iLoveMisskey">I <Mfm text="$[jelly ❤]"/> #eGirlskey</MkButton>
</div>
<FormSection v-if="instance.repositoryUrl !== 'https://activitypub.software/TransFem-org/Sharkey/'">
<FormSection v-if="instance.repositoryUrl !== 'https://gitdab.com/heartles/egirlskey/'">
<div class="_gaps_s">
<MkInfo>
{{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name }) }}
@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #icon><i class="ti ti-code"></i></template>
{{ i18n.ts._aboutMisskey.source }}
</FormLink>
<FormLink v-if="instance.providesTarball" :to="`/tarball/sharkey-${version}.tar.gz`" external>
<FormLink v-if="instance.providesTarball" :to="`/tarball/egirlskey-${version}.tar.gz`" external>
<template #icon><i class="ti ti-download"></i></template>
{{ i18n.ts._aboutMisskey.source }}
<template #suffix>Tarball</template>
@ -46,6 +46,15 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkInfo>
</div>
</FormSection>
<FormSection>
<div class="_gaps_s">
<FormLink to="https://gitdab.com/heartles/egirlskey/" external>
<template #icon><i class="ph-code ph-bold ph-lg"></i></template>
{{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original_egirlskey }})
<template #suffix>Gitdab</template>
</FormLink>
</div>
</FormSection>
<FormSection>
<div class="_gaps_s">
<FormLink to="https://activitypub.software/TransFem-org/Sharkey/" external>
@ -76,6 +85,15 @@ SPDX-License-Identifier: AGPL-3.0-only
</FormSection>
<FormSection>
<template #label>{{ i18n.ts._aboutMisskey.projectMembers }}</template>
<div :class="$style.contributors" style="margin-bottom: 8px;">
<a href="https://gitdab.com/heartles" target="_blank" :class="$style.contributor">
<img src="https://gitdab.com/avatar/23b9d5e61a48e641d1cd3562ea40c0f3?size=128" :class="$style.contributorAvatar">
<span :class="$style.contributorUsername">@heartles</span>
</a>
</div>
</FormSection>
<FormSection>
<template #label>Sharkey Contributors</template>
<div :class="$style.contributors" style="margin-bottom: 8px;">
<a href="https://activitypub.software/dakkar" target="_blank" :class="$style.contributor">
<img src="https://secure.gravatar.com/avatar/c71b315eed7c63ff94c42b1b3e8dbad1?s=192&d=identicon" :class="$style.contributorAvatar">
@ -113,7 +131,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #description><MkLink url="https://activitypub.software/TransFem-org/Sharkey/-/graphs/develop">{{ i18n.ts._aboutMisskey.allContributors }}</MkLink></template>
</FormSection>
<FormSection>
<template #label>{{ i18n.ts._aboutMisskey.testers }}</template>
<template #label>Sharkey Testers</template>
<div :class="$style.contributors" style="margin-bottom: 8px;">
<a href="https://antani.cyou/@lucent" target="_blank" :class="$style.contributor">
<img src="https://antani.cyou/proxy/avatar.webp?url=https%3A%2F%2Fantani.cyou%2Ffiles%2Fa2944119-024c-4abd-86e5-64bf0d30b26f&avatar=1" :class="$style.contributorAvatar">

6
packages/frontend/src/pages/about.overview.vue
View file

@ -22,16 +22,16 @@ SPDX-License-Identifier: AGPL-3.0-only
<FormSection>
<div class="_gaps_m">
<MkKeyValue :copy="version">
<template #key>Sharkey</template>
<template #key>eGirlskey</template>
<template #value>{{ version }}</template>
</MkKeyValue>
<div v-html="i18n.tsx.poweredByMisskeyDescription({ name: instance.name ?? host })">
</div>
<FormLink to="/about-sharkey">
<FormLink to="/about-egirlskey">
<template #icon><i class="ti ti-info-circle"></i></template>
{{ i18n.ts.aboutMisskey }}
</FormLink>
<FormLink v-if="instance.repositoryUrl || instance.providesTarball" :to="instance.repositoryUrl || `/tarball/sharkey-${version}.tar.gz`" external>
<FormLink v-if="instance.repositoryUrl || instance.providesTarball" :to="instance.repositoryUrl || `/tarball/egirlskey-${version}.tar.gz`" external>
<template #icon><i class="ti ti-code"></i></template>
{{ i18n.ts.sourceCode }}
</FormLink>

3
packages/frontend/src/pages/welcome.entrance.a.vue
View file

@ -11,7 +11,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="shape2"></div>
<div class="logo-wrapper">
<div class="powered-by">Powered by</div>
<img :src="misskeysvg" class="misskey"/>
eGirlskey
<!--<img :src="misskeysvg" class="misskey"/>-->
</div>
<div class="emojis">
<MkEmoji :normal="true" :noStyle="true" emoji="👍"/>

2
packages/frontend/src/pages/welcome.setup.vue
View file

@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div :class="$style.formContainer">
<form :class="$style.form" class="_panel" @submit.prevent="submit()">
<div :class="$style.title">
<div>Welcome to Sharkey!</div>
<div>Welcome to eGirlskey!</div>
<div :class="$style.version">v{{ version }}</div>
</div>
<div class="_gaps_m" style="padding: 32px;">

4
packages/frontend/src/router/definition.ts
View file

@ -204,8 +204,8 @@ const routes: RouteDef[] = [{
path: '/contact',
component: page(() => import('@/pages/contact.vue')),
}, {
path: '/about-sharkey',
component: page(() => import('@/pages/about-sharkey.vue')),
path: '/about-egirlskey',
component: page(() => import('@/pages/about-egirlskey.vue')),
}, {
path: '/invite',
name: 'invite',

2
packages/frontend/src/scripts/sanitize-html.ts
View file

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: dakkar and other Sharkey contributors
* SPDX-FileCopyrightText: dakkar and other eGirlskey contributors
* SPDX-License-Identifier: AGPL-3.0-only
*/

2
packages/frontend/src/ui/_common_/common.ts
View file

@ -126,7 +126,7 @@ export function openInstanceMenu(ev: MouseEvent) {
type: 'link',
text: i18n.ts.aboutMisskey,
icon: 'sk-icons sk-shark sk-icons-lg',
to: '/about-sharkey',
to: '/about-egirlskey',
}], ev.currentTarget ?? ev.target, {
align: 'left',
});

2
packages/frontend/src/ui/deck.vue
View file

@ -269,7 +269,7 @@ body {
overscroll-behavior: none;
}
#sharkey_app {
#egirlskey_app {
width: 100%;
height: 100%;
overflow: clip;

2
packages/frontend/src/ui/universal.vue
View file

@ -256,7 +256,7 @@ body {
overscroll-behavior: none;
}
#sharkey_app {
#egirlskey_app {
width: 100%;
height: 100%;
overflow: clip;

2
packages/misskey-js/src/autogen/apiClientJSDoc.ts
View file

@ -4258,7 +4258,7 @@ declare module '../api.js' {
): Promise<SwitchCaseResponseType<E, P>>;
/**
* Get Sharkey GH Sponsors
* Get eGirlskey GH Sponsors
*
* **Credential required**: *No*
*/

4
packages/misskey-js/src/autogen/types.ts
View file

@ -3673,7 +3673,7 @@ export type paths = {
'/sponsors': {
/**
* sponsors
* @description Get Sharkey GH Sponsors
* @description Get eGirlskey GH Sponsors
*
* **Credential required**: *No*
*/
@ -27988,7 +27988,7 @@ export type operations = {
};
/**
* sponsors
* @description Get Sharkey GH Sponsors
* @description Get eGirlskey GH Sponsors
*
* **Credential required**: *No*
*/

2
packages/sw/src/scripts/create-notification.ts
View file

@ -265,7 +265,7 @@ export async function createEmptyNotification(): Promise<void> {
await globalThis.registration.showNotification(
(new URL(origin)).host,
{
body: `Sharkey v${_VERSION_}`,
body: `eGirlskey v${_VERSION_}`,
silent: true,
badge: iconUrl('null'),
tag: 'read_notification',