Domain replacing

README.md

@@ -1,11 +1,11 @@
 ![](./astro/public/materials/longlogo.svg)
 
-[Skyshare](https://skyshare.uk/) is web application that BlueSky user saves their time of boring SNS X.com(Twitter).
+[Skyshare](https://skyshare.nekono.dev/) is web application that BlueSky user saves their time of boring SNS X.com(Twitter).
 
 ## How works
 
 Skyshare post your post to Bluesky with AT Protocol.  
-for twitter, because of X taxes, Skyshare present Post Link: [Like that](https://twitter.com/intent/tweet?text=This is tweet sample.&url=https://skyshare.uk/posts/nlla.bsky.social_3kk7qzpffl22n/), can only with media by OGP image.
+for twitter, because of X taxes, Skyshare present Post Link: [Like that](https://twitter.com/intent/tweet?text=This is tweet sample.&url=https://skyshare.nekono.dev/posts/nlla.bsky.social_3kk7qzpffl22n/), can only with media by OGP image.
 
 ## AT Protocol
 

astro/.env.development

@@ -1,4 +1,4 @@
-PUBLIC_CREATEPAGES_ENDPOINT="http://192.168.3.200:5000/ogp-generator-5f516/asia-northeast1/dev_ogp_generator"
-PUBLIC_DELETEPAGE_ENDPOINT="http://192.168.3.200:5000/ogp-generator-5f516/asia-northeast1/dev_editdb_endpoint"
+PUBLIC_CREATEPAGES_ENDPOINT="http://192.168.3.151:5000/ogp-generator-5f516/asia-northeast1/dev_ogp_generator"
+PUBLIC_DELETEPAGE_ENDPOINT="http://192.168.3.151:5000/ogp-generator-5f516/asia-northeast1/dev_editdb_endpoint"
 PUBLIC_GETPAGES_ENDPOINT="http://localhost:8087"
 PUBLIC_IS_NOT_PRODUCTION=${PUBLIC_IS_NOT_PRODUCTION:-true}

astro/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Skyshare 更新履歴
 
+## 1.5.6
+
+### Patch Changes
+
+- ドメイン名変更にともなうメンテナンス・無効なリンクの修正
+  - skyshare.uk は skyshare.nekono.dev にURLが順次変更になります。
+    - ukドメインの値段が150円ほど上がったので...
+  - Skythrowの画像がリンク切れになってしまっていたので修正しました。大変失礼いたしました。
+
 ## 1.5.5
 
 ### Patch Changes

astro/astro.config.mjs

@@ -8,7 +8,7 @@ import partytown from '@astrojs/partytown';
 /** @type {import('tailwindcss').Config} */
 export default defineConfig({
   base: "/",
-  site: "https://skyshare.uk/",
+  site: "https://skyshare.nekono.dev/",
   server: {
     port: 4321,
     host: true

astro/jest.config.cjs

@@ -1,5 +1,8 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
-    preset: 'ts-jest',
-    testEnvironment: 'node',
-};
+    preset: "ts-jest",
+    testEnvironment: "node",
+    moduleNameMapper: {
+        "@/(.*)$": "<rootDir>/src/$1",
+    },
+}

astro/package.json

@@ -1,7 +1,7 @@
 {
   "name": "skyshare",
   "type": "module",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "scripts": {
     "dev": "PUBLIC_VERSION=$npm_package_version astro dev",
     "prod": "PUBLIC_IS_NOT_PRODUCTION=false PUBLIC_VERSION=$npm_package_version astro dev",

astro/src/components/Client/AppForm.tsx

@@ -56,7 +56,7 @@ const Component = ({
         <>
             {session.accessJwt !== "" ? (
                 <>
-                    <AnnouceLabel />
+                    {/* <AnnouceLabel /> */}
                     {Forms({ mode })}
                     <div
                         className={["flex", "justify-center", "my-1"].join(" ")}

astro/src/env/vars.ts

@@ -1,5 +1,5 @@
-export const serviceurl = "skyshare.uk"
-export const githuburl = "https://github.com/nkte8/skyshare"
+export const serviceurl = "skyshare.nekono.dev"
+export const githuburl = "https://github.com/nekono-dev/skyshare"
 export const zennprofile = "https://zenn.dev/nkte8"
 export const zennurl = "https://zenn.dev/nkte8/articles/2024-02-03-r01"
 export const servicename = "Skyshare"

astro/src/pages/index.astro

@@ -64,21 +64,8 @@ const robots = ["index", "follow", "noarchive", "noimageindex"]
         >
             <div class="mt-2"><b>ネイティブアプリ対応</b>の</div>
             <div class="mb-2">Bluesky投稿専用クライアント</div>
-            <a href="https://skythrow.com">
-                <img
-                    src="https://cdn.bsky.app/img/avatar/plain/did:plc:5nor25cnkgdkhfgkgmgz4tn5/bafkreibnzneiofx44dwug3dqehanpnsyd5t3rdd2pgvoffbido6hbviesi@jpeg"
-                    class="w-20 h-20 rounded-2xl mx-auto mb-1"
-                />
-                SkyThrow</a
-            >
-            <!-- <div class="text-sm">
-                <img
-                    src="/apple-touch-icon.png"
-                    class="w-20 h-20 rounded-2xl mx-auto mb-1"
-                />
-                Skyshare
-            </div> -->
-            <div>を<a href={skythrowurl}>紹介・応援しています。</a></div>
+            <a href="https://skythrow.com">SkyThrow</a>を<a href={skythrowurl}
+                >応援しています。</a>
         </div>
     </div>
 </Pagelayout>

astro/src/pages/qa.astro

@@ -21,14 +21,6 @@ const robots = ["index", "nofollow", "noarchive", "noimageindex"]
 >
     <div class="mb-8">
         <h1>Q & A</h1>
-        <h3>
-            一応主要機能は完成したためリリースしましたが、まだまだおかしなところがあるかもしれません...
-        </h3>
-        <div>
-            不具合報告はウェルカムです！見落とし、予想外、不安定、これらによるバグ、全然あると思います。
-            基本的にはねこの一人で作ってるため、デバッガーは何人いても助かります！
-            もちろんBlueskyへのリプでの問い合わせやGithubへのIssue作成・PRも大歓迎です。
-        </div>
     </div>
 
     <div class="mb-8">
@@ -139,9 +131,9 @@ const robots = ["index", "nofollow", "noarchive", "noimageindex"]
                 >に問い合わせください。ベストエフォートで回答します。
             </div>
             <div>
-                もちろん<a href={githuburl}>
+                <a href={githuburl}>
                     SkyshareはOSS
-                </a>ですから、ソースコードを読んで理解したり、Issueを出していただいたり、PR修正を提案してくださるのもウェルカムです！
+                </a>なので、ソースコードを読んだり、PR修正を提案してくださるのもウェルカムです！
             </div>
         </div>
     </div>

astro/src/pages/skythrow.astro

@@ -30,26 +30,23 @@ const robots = ["index", "noarchive", "noimageindex"]
         <div class="mx-auto max-w-xl">
             <blockquote
                 class="bluesky-embed"
-                data-bluesky-uri="at://did:plc:5nor25cnkgdkhfgkgmgz4tn5/app.bsky.feed.post/3ksfkrrziz62l"
-                data-bluesky-cid="bafyreiev5o7lddp4uces2y52c4pxmyxaluilhlifvovgd24tgurzqvmnjy"
+                data-bluesky-uri="at://did:plc:5nor25cnkgdkhfgkgmgz4tn5/app.bsky.feed.post/3ksl2357b6z2g"
+                data-bluesky-cid="bafyreiduwr5yevf2p7g7fu5utrj24mtnhs7iqhrfhju2tp3g6s6ujphriy"
+                data-bluesky-embed-color-mode="system"
             >
                 <p lang="ja">
-                    I have released an Android ver. of SkyThrow, a dedicated
-                    bluesky posting client. We has the basic functions for
-                    posting, while focusing on the convenience of multiple
-                    accounts and hashtags.
-                    bluesky投稿専用クライアント「SkyThrow」のAndroid版をリリースしました。投稿に必要な基本機能を持ちつつ、マルチアカウントとハッシュタグへの便利を注力したクライアントとなります。
-                    #SkyThrow <br /><br /><a
-                        href="https://bsky.app/profile/did:plc:5nor25cnkgdkhfgkgmgz4tn5/post/3ksfkrrziz62l?ref_src=embed"
-                        >[image or embed]</a
-                    >
+                    bluesky投稿専用クライアント「SkyThrow」のiOS版もリリースしました!!
+                    The iOS version of SkyThrow, Bluesky posting only client,
+                    has also been released! https://skythrow.com/help/install/
+                    #skythrow<br /><br /><a
+                        href="https://bsky.app/profile/did:plc:5nor25cnkgdkhfgkgmgz4tn5/post/3ksl2357b6z2g?ref_src=embed"
+                        >[image or embed]</a>
                 </p>&mdash; SkyThrow (<a
                     href="https://bsky.app/profile/did:plc:5nor25cnkgdkhfgkgmgz4tn5?ref_src=embed"
                     >@skythrow.com</a
                 >) <a
-                    href="https://bsky.app/profile/did:plc:5nor25cnkgdkhfgkgmgz4tn5/post/3ksfkrrziz62l?ref_src=embed"
-                    >May 14, 2024 at 6:01</a
-                >
+                    href="https://bsky.app/profile/did:plc:5nor25cnkgdkhfgkgmgz4tn5/post/3ksl2357b6z2g?ref_src=embed"
+                    >2024年5月16日 10:18</a>
             </blockquote><script
                 async
                 src="https://embed.bsky.app/static/embed.js"
@@ -60,19 +57,19 @@ const robots = ["index", "noarchive", "noimageindex"]
                 >投稿の共有機能を用いることで、Xや様々なサービスへのクロスポストが可能です。</b
             >
         </div>
-        <div class="mx-auto max-w-md w-fit">
+        <div class="mx-auto max-w-md">
             <iframe
-                class="w-fit h-auto aspect-[1/2]"
+                width="409"
+                height="727"
                 src="https://www.youtube.com/embed/laUPVd6Lfvc"
                 title='bluesky post only client "SkyThrow" DEMO'
                 allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
                 referrerpolicy="strict-origin-when-cross-origin"
                 allowfullscreen></iframe>
         </div>
         <div class="my-4">
-            現在はAndroid版とiOS版がすでにリリースされています！<br
-            />
-            ぜひ「SkyThrow」をご利用ください。
+            現在はAndroid版とiOS版がすでにリリースされています！<br />
+            「SkyThrow」もよろしくお願いいたします。
         </div>
         <b
             >インストールはこちら → <a

astro/tests/getOgp.test.ts

@@ -3,7 +3,7 @@ import { getOgpMeta } from "../src/lib/getOgp"
 import type { ogpMetaData, errorResponse } from "../src/lib/api/types"
 
 const version = `v${process.env.PUBLIC_VERSION}`
-const siteurl = "http://192.168.3.200:4321"
+const siteurl = "http://192.168.3.151:4321"
 
 // 本テストは正しい情報取得のため、 `npm run prod` で APIサーバを起動して行うこと。
 // 本番環境(cloudflare hosted)では、そもそもstatus codeが2XX系ではない場合、専用ページ(html)が返却されるため、
@@ -13,15 +13,15 @@ describe("getOgp Test", () => {
     test("True Website test", async () => {
         const result: ogpMetaData | errorResponse = await getOgpMeta({
             siteurl: siteurl,
-            externalUrl: "https://skyshare.uk",
+            externalUrl: "https://skyshare.nekono.dev/",
             languageCode: "ja",
         })
         expect(result).toEqual(<ogpMetaData>{
             type: "meta",
             title: "Skyshare - Share Bluesky to X",
             description:
                 "Skyshare is a web application helps bluesky users post to both bluesky or x.com.",
-            image: `https://skyshare.uk/materials/ogp_main.png?updated=${version}`,
+            image: `https://skyshare.nekono.dev/materials/ogp_main.png?updated=${version}`,
         })
     }, 10000) // long timeouf)
     // YoutubeはCORSが設定されている例
@@ -75,7 +75,7 @@ describe("getOgp Test", () => {
         const result: ogpMetaData | errorResponse = await getOgpMeta({
             siteurl: siteurl,
             externalUrl:
-                "https://twitter.com/nekono_dev/status/1774369918726947311",
+                "https://x.com/nekono_dev/status/1774369918726947311",
             languageCode: "ja",
         })
         expect(result).toEqual(<ogpMetaData>{
@@ -96,6 +96,7 @@ describe("getOgp Test", () => {
         expect(result).toEqual(<errorResponse>{
             type: "error",
             error: "Bad Gateway@getOgpMeta",
+            status: 500,
             message:
                 "Failed to get correct response from gateway. Announce server administrator.",
         })
@@ -109,6 +110,7 @@ describe("getOgp Test", () => {
         expect(result).toEqual(<errorResponse>{
             type: "error",
             error: "Bad Gateway@getOgpMeta",
+            status: 500,
             message:
                 "Failed to get correct response from gateway. Announce server administrator.",
         })
@@ -122,6 +124,7 @@ describe("getOgp Test", () => {
         expect(result).toEqual(<errorResponse>{
             type: "error",
             error: "Bad Gateway@getOgpMeta",
+            status: 500,
             message:
                 "Failed to get correct response from gateway. Announce server administrator.",
         })
@@ -135,6 +138,7 @@ describe("getOgp Test", () => {
         expect(result).toEqual(<errorResponse>{
             type: "error",
             error: "Bad Gateway@getOgpMeta",
+            status: 500,
             message:
                 "Failed to get correct response from gateway. Announce server administrator.",
         })
@@ -151,7 +155,7 @@ describe("getOgp Test", () => {
         expect(result).toEqual(<ogpMetaData>{
             type: "meta",
             title: "Via Chicago",
-            description: "ウィルコ · 曲 · 2005",
+            description: "ウィルコ · Kicking Television, Live in Chicago · 曲 · 2005",
             image: "https://i.scdn.co/image/ab67616d0000b273ca812e1712f8b09c30351378",
         })
     }, 100000) // long timeouf)

firebase/README.md

@@ -30,7 +30,7 @@ npm run build
 ## ...or run as daemon. it works functions autoload if typescript changed.
 npm run build:watch
 ## serve local
-firebase serve -o 192.168.3.200 -p 5000
+firebase serve -o 192.168.3.151 -p 5000
 ```
 
 Deploy staging and prod.

firebase/functions/src/vars.ts

@@ -1,7 +1,7 @@
 export const domain = /skyshare\.uk$/
 export type envName = "dev" | "prod"
 export const envParam = {
-    dev: "ogpdev",
+    dev: "ogp",
     prod: "ogp"
 };
 export const storageUrl = "gs://ogp-generator-5f516.appspot.com"

workers/src/index.ts

@@ -15,7 +15,7 @@ export default {
 		let corsHeaders = {}
 		if (env.ENV === "prod") {
 			corsHeaders = {
-				"Access-Control-Allow-Origin": "https://skyshare.uk",
+				"Access-Control-Allow-Origin": "https://skyshare.nekono.dev",
 				"Access-Control-Allow-Methods": "GET,OPTIONS",
 				"Access-Control-Allow-Headers": 'Content-Type',
 			};