Merge branch 'main' into fixmcm

grammyjs · May 30, 2024 · c58ce37 · c58ce37
2 parents 9ae9720 + 455fbb7
commit c58ce37
Show file tree

Hide file tree

Showing 21 changed files with 385 additions and 401 deletions.
diff --git a/site/api/components/Class/Constructors.tsx b/site/api/components/Class/Constructors.tsx
@@ -24,7 +24,9 @@ export function Constructors({
             {v.accessibility
               ? <StyleKw>{v.accessibility}{" "}</StyleKw>
               : undefined}
-            <span style="color: rgb(98, 232, 132);">{v.name}</span>(
+            <span style="--shiki-light:#6F42C1;--shiki-dark:#B392F0;">
+              {v.name}
+            </span>(
             <Params getLink={getLink}>{v.params}</Params>);
           </CodeBlock>
           {"jsDoc" in v && <P doc>{v.jsDoc?.doc}</P>}

diff --git a/site/api/components/Class/Method.tsx b/site/api/components/Class/Method.tsx
@@ -73,13 +73,23 @@ export function Def(
   return (
     <>
       {method.kind == "setter"
-        ? <span style="color: #F286C4;">set{" "}</span>
+        ? (
+          <span style="--shiki-light:#24292E;--shiki-dark:#E1E4E8;">
+            set{" "}
+          </span>
+        )
         : method.kind == "getter"
-        ? <span style="color: #F286C4;">get{" "}</span>
+        ? (
+          <span style="--shiki-light:#24292E;--shiki-dark:#E1E4E8;">
+            get{" "}
+          </span>
+        )
         : (
           ""
         )}
-      <span style="color: #62E884">{method.name}</span>
+      <span style="--shiki-light:#6F42C1;--shiki-dark:#B392F0;">
+        {method.name}
+      </span>
       <TypeParams_ getLink={getLink}>
         {typeParams}
       </TypeParams_>(

diff --git a/site/api/components/CodeBlock.tsx b/site/api/components/CodeBlock.tsx
@@ -4,12 +4,13 @@ export function CodeBlock({ children }: { children?: ComponentChildren }) {
   return (
     <>
       {"\n\n"}
-      <div class="language-ts">
+      <div class="language-ts vp-adaptive-theme">
+        <button title="Copy Code" class="copy"></button>
+        <span class="lang">ts</span>
         {"\n\n"}
-        <pre class="shiki dracula-soft">
-            <code>{children}</code>
+        <pre class="shiki shiki-themes github-light github-dark vp-code">
+          <code style="--shiki-light:#24292E;--shiki-dark:#E1E4E8;">{children}</code>
         </pre>
-        {"\n\n"}
       </div>
       {"\n\n"}
     </>

diff --git a/site/api/components/PropertyName.tsx b/site/api/components/PropertyName.tsx
@@ -9,11 +9,11 @@ export function PropertyName({
 }) {
   return (
     <>
-      <span style={klass ? "" : "color:#FFB86C;font-style:italic;"}>
+      <span style={klass ? "" : "--shiki-light:#24292E;--shiki-dark:#E1E4E8;"}>
         {name}
       </span>
       {(optional || hasType) && (
-        <span style="color:#F286C4;">
+        <span style="--shiki-light:#24292E;--shiki-dark:#E1E4E8;">
           {optional && <>?</>}
           {hasType && <>:</>}
         </span>

diff --git a/site/api/components/styles.tsx b/site/api/components/styles.tsx
@@ -1,25 +1,33 @@
 import { ComponentChildren } from "preact";
 
 export function StyleKw({ children }: { children?: ComponentChildren }) {
-  return <span style="color:#F286C4;">{children}</span>;
+  return (
+    <span style="--shiki-light:#D73A49;--shiki-dark:#F97583;">{children}</span>
+  );
 }
 
 export function StyleStrLit({ children }: { children?: ComponentChildren }) {
-  return <span style="color:#E7EE98;">{children}</span>;
+  return (
+    <span style="--shiki-light:#032F62;--shiki-dark:#9ECBFF;">{children}</span>
+  );
 }
 
 export function StyleTypeRef({ children }: { children?: ComponentChildren }) {
   return (
-    <span style="color:#97E1F1;font-style:italic;">
+    <span style="--shiki-light:#24292E;--shiki-dark:#E1E4E8;">
       {children}
     </span>
   );
 }
 
 export function StyleCallee({ children }: { children?: ComponentChildren }) {
-  return <span style="color:#62E884">{children}</span>;
+  return (
+    <span style="--shiki-light:#6F42C1;--shiki-dark:#B392F0;">{children}</span>
+  );
 }
 
 export function StyleNum({ children }: { children?: ComponentChildren }) {
-  return <span style="color:#BF9EEE">{children}</span>;
+  return (
+    <span style="--shiki-light:#005CC5;--shiki-dark:#79B8FF;">{children}</span>
+  );
 }
diff --git a/site/docs/.vitepress/configs/locales/en.ts b/site/docs/.vitepress/configs/locales/en.ts
@@ -356,6 +356,10 @@ const hostingOverview = {
 const hostingTutorials = {
   text: "Tutorials",
   items: [
+    {
+      text: "Virtual Private Server (VPS)",
+      link: "/hosting/vps",
+    },
     {
       text: "Deno Deploy",
       link: "/hosting/deno-deploy",
@@ -372,10 +376,6 @@ const hostingTutorials = {
       text: "Cloudflare Workers (Node.js)",
       link: "/hosting/cloudflare-workers-nodejs",
     },
-    {
-      text: "Heroku",
-      link: "/hosting/heroku",
-    },
     {
       text: "Fly",
       link: "/hosting/fly",
@@ -384,10 +384,6 @@ const hostingTutorials = {
       text: "Firebase Functions",
       link: "/hosting/firebase",
     },
-    {
-      text: "Google Cloud Functions",
-      link: "/hosting/gcf",
-    },
     {
       text: "Vercel",
       link: "/hosting/vercel",
@@ -397,8 +393,8 @@ const hostingTutorials = {
       link: "/hosting/cyclic",
     },
     {
-      text: "Virtual Private Server",
-      link: "/hosting/vps",
+      text: "Heroku",
+      link: "/hosting/heroku",
     },
   ],
 };

diff --git a/site/docs/.vitepress/configs/locales/es.ts b/site/docs/.vitepress/configs/locales/es.ts
@@ -321,6 +321,10 @@ const hostingOverview = {
 const hostingTutorials = {
   text: "Tutoriales",
   items: [
+    {
+      text: "Servidor Privado Virtual (VPS)",
+      link: "/es/hosting/vps",
+    },
     {
       text: "Deno Deploy",
       link: "/es/hosting/deno-deploy",
@@ -337,10 +341,6 @@ const hostingTutorials = {
       text: "Cloudflare Workers (Node.js)",
       link: "/es/hosting/cloudflare-workers-nodejs",
     },
-    {
-      text: "Heroku",
-      link: "/es/hosting/heroku",
-    },
     {
       text: "Fly",
       link: "/es/hosting/fly",
@@ -349,10 +349,6 @@ const hostingTutorials = {
       text: "Firebase Functions",
       link: "/es/hosting/firebase",
     },
-    {
-      text: "Google Cloud Functions",
-      link: "/es/hosting/gcf",
-    },
     {
       text: "Vercel",
       link: "/es/hosting/vercel",
@@ -362,8 +358,8 @@ const hostingTutorials = {
       link: "/es/hosting/cyclic",
     },
     {
-      text: "Servidor Privado Virtual",
-      link: "/es/hosting/vps",
+      text: "Heroku",
+      link: "/es/hosting/heroku",
     },
   ],
 };

diff --git a/site/docs/.vitepress/configs/locales/id.ts b/site/docs/.vitepress/configs/locales/id.ts
@@ -320,6 +320,10 @@ const hostingOverview = {
 const hostingTutorials = {
   text: "Tutorial",
   items: [
+    {
+      text: "Virtual Private Server (VPS)",
+      link: "/id/hosting/vps",
+    },
     {
       text: "Deno Deploy",
       link: "/id/hosting/deno-deploy",
@@ -336,10 +340,6 @@ const hostingTutorials = {
       text: "Cloudflare Workers (Node.js)",
       link: "/id/hosting/cloudflare-workers-nodejs",
     },
-    {
-      text: "Heroku",
-      link: "/id/hosting/heroku",
-    },
     {
       text: "Fly",
       link: "/id/hosting/fly",
@@ -348,10 +348,6 @@ const hostingTutorials = {
       text: "Firebase Functions",
       link: "/id/hosting/firebase",
     },
-    {
-      text: "Google Cloud Functions",
-      link: "/id/hosting/gcf",
-    },
     {
       text: "Vercel",
       link: "/id/hosting/vercel",
@@ -361,8 +357,8 @@ const hostingTutorials = {
       link: "/id/hosting/cyclic",
     },
     {
-      text: "Virtual Private Server",
-      link: "/id/hosting/vps",
+      text: "Heroku",
+      link: "/id/hosting/heroku",
     },
   ],
 };

diff --git a/site/docs/.vitepress/configs/locales/uk.ts b/site/docs/.vitepress/configs/locales/uk.ts
@@ -325,6 +325,10 @@ const hostingOverview = {
 const hostingTutorials = {
   text: "Посібники",
   items: [
+    {
+      text: "Віртуальний приватний сервер (VPS)",
+      link: "/uk/hosting/vps",
+    },
     {
       text: "Deno Deploy",
       link: "/uk/hosting/deno-deploy",
@@ -341,10 +345,6 @@ const hostingTutorials = {
       text: "Cloudflare Workers (Node.js)",
       link: "/uk/hosting/cloudflare-workers-nodejs",
     },
-    {
-      text: "Heroku",
-      link: "/uk/hosting/heroku",
-    },
     {
       text: "Fly",
       link: "/uk/hosting/fly",
@@ -353,10 +353,6 @@ const hostingTutorials = {
       text: "Firebase Functions",
       link: "/uk/hosting/firebase",
     },
-    {
-      text: "Google Cloud Functions",
-      link: "/uk/hosting/gcf",
-    },
     {
       text: "Vercel",
       link: "/uk/hosting/vercel",
@@ -366,8 +362,8 @@ const hostingTutorials = {
       link: "/uk/hosting/cyclic",
     },
     {
-      text: "Віртуальний приватний сервер",
-      link: "/uk/hosting/vps",
+      text: "Heroku",
+      link: "/uk/hosting/heroku",
     },
   ],
 };

diff --git a/site/docs/.vitepress/configs/locales/zh.ts b/site/docs/.vitepress/configs/locales/zh.ts
@@ -325,6 +325,10 @@ const hostingOverview = {
 const hostingTutorials = {
   text: "教程",
   items: [
+    {
+      text: "Virtual Private Server (VPS)",
+      link: "/zh/hosting/vps",
+    },
     {
       text: "Deno Deploy",
       link: "/zh/hosting/deno-deploy",
@@ -341,10 +345,6 @@ const hostingTutorials = {
       text: "Cloudflare Workers (Node.js)",
       link: "/zh/hosting/cloudflare-workers-nodejs",
     },
-    {
-      text: "Heroku",
-      link: "/zh/hosting/heroku",
-    },
     {
       text: "Fly",
       link: "/zh/hosting/fly",
@@ -353,10 +353,6 @@ const hostingTutorials = {
       text: "Firebase Functions",
       link: "/zh/hosting/firebase",
     },
-    {
-      text: "Google Cloud Functions",
-      link: "/zh/hosting/gcf",
-    },
     {
       text: "Vercel",
       link: "/zh/hosting/vercel",
@@ -366,8 +362,8 @@ const hostingTutorials = {
       link: "/zh/hosting/cyclic",
     },
     {
-      text: "Virtual Private Server",
-      link: "/zh/hosting/vps",
+      text: "Heroku",
+      link: "/zh/hosting/heroku",
     },
   ],
 };

diff --git a/site/docs/.vitepress/theme/layout/Layout.vue b/site/docs/.vitepress/theme/layout/Layout.vue
@@ -1,10 +1,14 @@
 <script setup lang="ts">
-import DefaultTheme from 'vitepress/theme-without-fonts'
-import { useData } from 'vitepress'
+import DefaultTheme from "vitepress/theme-without-fonts";
+import { useData } from "vitepress";
 import HomeHeroInfo from "./HomeHeroInfo.vue";
+import { onMounted } from "vue";
+import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
 
 const { Layout } = DefaultTheme as any;
 const { frontmatter } = useData();
+
+onMounted(() => polyfillCountryFlagEmojis());
 </script>
 
 <template>
@@ -13,4 +17,4 @@ const { frontmatter } = useData();
       <HomeHeroInfo :name="frontmatter.hero.name" :text="frontmatter.hero.text" :taglines="frontmatter.hero.taglines" />
     </template>
   </Layout>
-</template>
+</template>
diff --git a/site/docs/.vitepress/theme/style/_fonts.scss b/site/docs/.vitepress/theme/style/_fonts.scss
@@ -34,9 +34,9 @@ input:checked + label,
 .VPNav .title,
 .custom-block-title,
 .outline-title {
-  font-family: InterVariable, "Inter var", "Inter", ui-sans-serif, system-ui,
-    -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue",
-    Helvetica, Arial, "Noto Sans", "Apple Color Emoji", "Segoe UI Emoji",
-    "Segoe UI Symbol", "Noto Color Emoji", Oxygen, Ubuntu, Cantarell,
-    "Fira Sans", "Droid Sans", sans-serif;
+  font-family: "Twemoji Country Flags", InterVariable, "Inter var", "Inter",
+      ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
+      Roboto, "Helvetica Neue", Helvetica, Arial, "Noto Sans", "Apple Color Emoji",
+      "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji", Oxygen, Ubuntu,
+      Cantarell, "Fira Sans", "Droid Sans", sans-serif;
 }
diff --git a/site/docs/.vitepress/theme/style/_vars.scss b/site/docs/.vitepress/theme/style/_vars.scss
@@ -61,9 +61,9 @@
  * -------------------------------------------------------------------------- */
 
 :root {
-  --vp-font-family-base: InterVariable, "Inter var", "Inter",
-    ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI",
-    Roboto, "Helvetica Neue", Helvetica, Arial, "Apple Color Emoji",
+  --vp-font-family-base: "Twemoji Country Flags", InterVariable, "Inter var",
+    "Inter", ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
+    "Segoe UI", Roboto, "Helvetica Neue", Helvetica, Arial, "Apple Color Emoji",
     "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji", Oxygen, Ubuntu,
     Cantarell, "Fira Sans", "Droid Sans", sans-serif;
   --vp-font-family-mono: "Source Code Pro", "SF Mono", Consolas, Monaco,

diff --git a/site/docs/README.md b/site/docs/README.md
@@ -100,8 +100,8 @@ Works! :tada:
 
 <div style="font-size: 0.75rem; display: flex; justify-content: center;">
 
-© 2021-2024 &middot; grammY supports Telegram Bot API 7.3 which was [released](https://core.telegram.org/bots/api#may-6-2024) on May 6, 2024.
-(Last highlight: Inline Keyboards in Business Chats)
+© 2021-2024 &middot; grammY supports Telegram Bot API 7.4 which was [released](https://core.telegram.org/bots/api#may-28-2024) on May 28, 2024.
+(Last highlight: Telegram Stars)
 
 </div>
 </footer>