Browse Source

ref: replace old repo link

Sv443 1 month ago
parent
commit
15935703b2

+ 3 - 3
.github/Contributing.md

@@ -18,14 +18,14 @@ To submit it through code, you can make use of the ["submit" endpoint.](https://
 If you instead want to edit a joke yourself, you can find them in the `jokes-xy.json` files in [`data/jokes/`](../data/jokes/)  
 To submit your changes, create a pull request. Also make sure to follow the [code contribution instructions.](#submitting-code)  
   
-If you want a joke to be edited or deleted, please submit a new issue [here.](https://github.com/Sv443/JokeAPI/issues/new?assignees=Sv443&labels=reported+joke&template=3_report_a_joke.md&title=)  
+If you want a joke to be edited or deleted, please submit a new issue [here.](https://github.com/Sv443-Network/JokeAPI/issues/new?assignees=Sv443&labels=reported+joke&template=3_report_a_joke.md&title=)  
 Keep in mind, though, that I will not remove jokes based on opinions as that would defeat the API's main purpose, to provide jokes for everyone's taste.  
 
 <br><br>
 
 ## Submitting code:
 1. [Read the Code_of_Conduct.md file](./Code_of_Conduct.md) (TLDR: just behave in a friendly manner).
-2. [Click here](https://github.com/Sv443/JokeAPI/fork) to fork the repository. Afterwards, clone or download it and locate the folder where it is contained.
+2. [Click here](https://github.com/Sv443-Network/JokeAPI/fork) to fork the repository. Afterwards, clone or download it and locate the folder where it is contained.
 3. Make the changes you want to make to the code.
 4. Run the script `npm run all` which will run these commands:
     - `npm run validate-jokes` to make sure all jokes are formatted correctly.
@@ -37,7 +37,7 @@ Keep in mind, though, that I will not remove jokes based on opinions as that wou
 5. Run JokeAPI locally by running the command `node JokeAPI`, request some jokes and test the areas you modified / added to make sure everything still works.
 6. Add yourself to the `contributors` object in the [`package.json`](../package.json) file :)
     <!-- - **If it doesn't exist or is empty** please add it using the second format on [this website](https://flaviocopes.com/package-json/#contributors) -->
-7. Submit a pull request on your forked repository, selecting `Sv443/JokeAPI` as the base repo and `master` as the base branch and selecting `YourUsername/JokeAPI` as the head repo and `YourBranch` as the compare branch
+7. Submit a pull request on your forked repository, selecting `Sv443-Network/JokeAPI` as the base repo and `master` as the base branch and selecting `YourUsername/JokeAPI` as the head repo and `YourBranch` as the compare branch
     - If your pull request is not ready to be merged yet, you can add `[WIP]` to the beginning of the title which will tell the repo maintainer(s) and automated scripts not to merge it yet.
 8. Request a review from me (Sv443).
 9. Check if the CI script and other checks for your pull request were successful (they can be found below the comments).

+ 1 - 1
.github/ISSUE_TEMPLATE/4_add_dependent.md

@@ -10,7 +10,7 @@ assignees: Sv443
 <!--
     If this issue is approved, your project will be added to these dependent lists:
     - https://jokeapi.dev/#dependents
-    - https://github.com/Sv443/JokeAPI#readme    (scroll down all the way)
+    - https://github.com/Sv443-Network/JokeAPI#readme    (scroll down all the way)
 -->
 
 ## Link to the project:

+ 1 - 1
.github/ISSUE_TEMPLATE/config.yml

@@ -8,7 +8,7 @@ contact_links:
   -
     name: "Discussions"
     about: "If there's some topic you want to talk about, please open a new thread on the JokeAPI discussion board"
-    url: "https://github.com/Sv443/JokeAPI/discussions"
+    url: "https://github.com/Sv443-Network/JokeAPI/discussions"
   -
     name: "Chat"
     about: "If you want to chat with the JokeAPI community, you can join my Discord server"

+ 3 - 3
.github/PULL_REQUEST_TEMPLATE.md

@@ -18,9 +18,9 @@
 <!-- Add some screenshots here, if applicable -->
 
 ## Checklist
-- [ ] I have read and followed the [Contributing Guide](https://github.com/Sv443/JokeAPI/blob/master/.github/Contributing.md)
-- [ ] I have read and accept the [Code of Conduct](https://github.com/Sv443/JokeAPI/blob/master/.github/Code_of_Conduct.md) (TLDR: just behave in a friendly manner)
-- [ ] My code follows the general style of this project ([explained here](https://github.com/Sv443/JokeAPI/blob/version/2.4.0/dev/docs/code-style.md#readme))
+- [ ] I have read and followed the [Contributing Guide](https://github.com/Sv443-Network/JokeAPI/blob/master/.github/Contributing.md)
+- [ ] I have read and accept the [Code of Conduct](https://github.com/Sv443-Network/JokeAPI/blob/master/.github/Code_of_Conduct.md) (TLDR: just behave in a friendly manner)
+- [ ] My code follows the general style of this project ([explained here](https://github.com/Sv443-Network/JokeAPI/blob/version/2.4.0/dev/docs/code-style.md#readme))
 - [ ] I have commented my code, particularly in hard-to-understand areas
 - [ ] I have made corresponding changes to the documentation (if applicable)
 - [ ] I ensured that the automated checks that ran on this PR have completed successfully

+ 1 - 1
JokeAPI.js

@@ -1,6 +1,6 @@
 // 🔹 JokeAPI by Sv443 🔹
 //
-// GitHub:    https://github.com/Sv443/JokeAPI
+// GitHub:    https://github.com/Sv443-Network/JokeAPI
 // API Docs:  https://jokeapi.dev/
 // ️
 // ⚠️ Please read the LICENSE.txt file before modifying, redistributing or even selling JokeAPI.

+ 9 - 9
README.md

@@ -2,15 +2,15 @@
 
 ### A REST API that serves uniformly and well formatted jokes and offers a great variety of filtering methods and response customization
 
-[![GitHub](https://img.shields.io/github/license/Sv443/JokeAPI)](https://sv443.net/LICENSE)
+[![GitHub](https://img.shields.io/github/license/Sv443-Network/JokeAPI)](https://sv443.net/LICENSE)
 [![Uptime / 7 Days](https://img.shields.io/uptimerobot/ratio/7/m784261094-bff76b959ebb8fc39f7eb2d0)](https://status.sv443.net/)
-[![Open Issues](https://img.shields.io/github/issues/Sv443/JokeAPI)](https://github.com/Sv443/JokeAPI/issues)
+[![Open Issues](https://img.shields.io/github/issues/Sv443-Network/JokeAPI)](https://github.com/Sv443-Network/JokeAPI/issues)
 
-[![Actions Status](https://github.com/Sv443/JokeAPI/workflows/build/badge.svg)](https://github.com/Sv443/JokeAPI/actions)
-[![Known Vulnerabilities](https://snyk.io/test/github/Sv443/JokeAPI/badge.svg)](https://snyk.io/test/github/Sv443/JokeAPI)
+[![Actions Status](https://github.com/Sv443-Network/JokeAPI/workflows/build/badge.svg)](https://github.com/Sv443-Network/JokeAPI/actions)
+[![Known Vulnerabilities](https://snyk.io/test/github/Sv443-Network/JokeAPI/badge.svg)](https://snyk.io/test/github/Sv443-Network/JokeAPI)
 
 [![Discord](https://img.shields.io/discord/565933531214118942)](https://discord.gg/aBH4uRG)
-[![GitHub stars](https://img.shields.io/github/stars/Sv443/JokeAPI?style=social)](https://github.com/Sv443/JokeAPI/stargazers)
+[![GitHub stars](https://img.shields.io/github/stars/Sv443-Network/JokeAPI?style=social)](https://github.com/Sv443-Network/JokeAPI/stargazers)
 
 <br><br>
 
@@ -56,13 +56,13 @@
 | [Joke Teller](https://github.com/AlHood77/Joke_Teller)                                                   | [AlHood77](https://github.com/AlHood77)                    |
 | [Jokes plugin for Craft CMS 3.x](https://github.com/remcoov/jokes)                                       | [remcoov](https://github.com/remcoov)                      |
 | [PoshBot.Joker](https://github.com/ToastIT-dev/PoshBot.Joker)                                            | [ToastIT-dev](https://github.com/ToastIT-dev)              |
-| [JokeAPI_ComputerCraft](https://github.com/Sv443/JokeAPI_ComputerCraft)                                  | [Sv443](https://github.com/Sv443)                          |
+| [JokeAPI_ComputerCraft](https://github.com/Sv443-Network/JokeAPI_ComputerCraft)                                  | [Sv443](https://github.com/Sv443)                          |
 | [Dev Dad Jokes](https://github.com/jonathanbossenger/devdadjokes)                                        | [Jonathan Bossenger](https://github.com/jonathanbossenger) |
 
 <br>
 
 Project submissions are paused for the foreseeable future.
-<!-- [Submit an issue](https://github.com/Sv443/JokeAPI/issues/new/choose) and select `Dependent` to get your project added here -->
+<!-- [Submit an issue](https://github.com/Sv443-Network/JokeAPI/issues/new/choose) and select `Dependent` to get your project added here -->
 
 <!--
 Old list-style dependents:
@@ -77,10 +77,10 @@ Old list-style dependents:
 - [Joke Teller](https://github.com/AlHood77/Joke_Teller) by [AlHood77](https://github.com/AlHood77)
 - [Jokes plugin for Craft CMS 3.x](https://github.com/remcoov/jokes) by [remcoov](https://github.com/remcoov)
 - [PoshBot.Joker](https://github.com/ToastIT-dev/PoshBot.Joker) by [ToastIT-dev](https://github.com/ToastIT-dev)
-- [JokeAPI_ComputerCraft](https://github.com/Sv443/JokeAPI_ComputerCraft) by [Sv443](https://github.com/Sv443)
+- [JokeAPI_ComputerCraft](https://github.com/Sv443-Network/JokeAPI_ComputerCraft) by [Sv443](https://github.com/Sv443)
 -->
 
 <br><br>
 
-Made with ❤️ by [Sv443](https://github.com/Sv443) and [contributors](https://github.com/Sv443/JokeAPI/graphs/contributors)  
+Made with ❤️ by [Sv443](https://github.com/Sv443) and [contributors](https://github.com/Sv443-Network/JokeAPI/graphs/contributors)  
 Like JokeAPI? Please consider [supporting me](https://github.com/sponsors/Sv443)

+ 10 - 10
docs/raw/index.html

@@ -71,22 +71,22 @@
                 <span class="headeritem r">
                     <span id="headerversion">
                         <span id="headerVersionNumber">v<!--%#INSERT:VERSION#%--></span>
-                        <a id="changelogLink" href="https://github.com/Sv443/JokeAPI/blob/master/changelog.md#readme" target="_blank">(Changelog)</a><br>
+                        <a id="changelogLink" href="https://github.com/Sv443-Network/JokeAPI/blob/master/changelog.md#readme" target="_blank">(Changelog)</a><br>
                         <a href="<!--%#INSERT:PROJGITHUBURL#%-->">GitHub</a>&nbsp;<span class="mobileHide">&bull;&nbsp;<a href="#legal">Legal&nbsp;Stuff</a>&nbsp;</span>&bull;&nbsp;<a href="<!--%#INSERT:AUTHORGITHUBURL#%-->">Author</a>
                     </span>
                 </span>
             </header>
             <main id="content" class="bodyFlexItem">
                 <noscript>
-                    <h3 style="color: #ff7644;">You have disabled the execution of JavaScript code in your browser. Please note that this will severely impact your experience on this page.</h3>
-                    <span style="color: #ff7644;">
+                    <h3 style="color: #ff6655;">You have disabled the execution of JavaScript code in your browser. Please note that this will severely impact your experience on this page.</h3>
+                    <span style="color: #ff6655;">
                         If you didn't disable JavaScript code, the website might have loaded incorrectly. In this case, please press the <kbd>F5</kbd> key to try again.
                     </span>
                     <br><br>
                 </noscript>
 
                 <div id="usageTerms">
-                    <h2 style="color: #ff7644;">By using this website and API you are agreeing to the <a href="<!--%#INSERT:PRIVACYPOLICYURL#%-->">privacy policy</a></h2>
+                    <h2 style="color: #ff6655;">By using this website and API you are agreeing to the <a href="<!--%#INSERT:PRIVACYPOLICYURL#%-->">privacy policy</a></h2>
                     <div id="usageTermsInnerLayout">
                         <span class="itm">
                             <span class="mimica" onclick="privPolMoreInfo()">(Click here to get more information on what data <!--%#INSERT:NAME#%--> collects)</span>
@@ -151,7 +151,7 @@
                 <div class="subHeaderContainer"><a href="#security" title="Click to link to this header">§</a> <span class="subHeader" id="security">Security:</span></div>
                 <!--%#INSERT:NAME#%--> has been a target of DoS attacks in the past, which is why there is now a limit of <!--%#INSERT:RATELIMITCOUNT#%--> requests per minute and why joke submissions are manually curated. For more information <a href="#rate-limiting">click here.</a><br>
                 <br>
-                All dependencies are tested for vulnerabilities by <a href="https://snyk.io/" target="_blank">Snyk</a>, you can find a summary of the known vulnerabilities <a href="https://snyk.io/test/github/Sv443/JokeAPI" target="_blank">here.</a><br>
+                All dependencies are tested for vulnerabilities by <a href="https://snyk.io/" target="_blank">Snyk</a>, you can find a summary of the known vulnerabilities <a href="https://snyk.io/test/github/Sv443-Network/JokeAPI" target="_blank">here.</a><br>
                 Page security score (powered by Mozilla Observatory): <a href="https://observatory.mozilla.org/analyze/sv443.net" target="_blank"><img src="https://img.shields.io/mozilla-observatory/grade-score/sv443.net?publish" class="badge"></a><br>
 
 
@@ -422,7 +422,7 @@
 
 		<div>
 			Joke submissions have been disabled for the forseeable future.<br>
-			Please see <a href="https://github.com/Sv443/JokeAPI/issues/489" target="_blank">this GitHub issue</a> for more info.
+			Please see <a href="https://github.com/Sv443-Network/JokeAPI/issues/489" target="_blank">this GitHub issue</a> for more info.
 		</div>
 
                 <div id="submissions-hidden"><div id="submitContainer" class="highlightedContainer">
@@ -606,7 +606,7 @@ None. It's a hardware problem.
                 If no suitable system language is found, <!--%#INSERT:NAME#%--> will default to English.<br>
                 The language codes in <!--%#INSERT:NAME#%--> follow the <a href="https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes" target="_blank">ISO 639-1</a> / Alpha-2 specification.<br>
                 <br>
-                If you are interested in providing translations, please read the <a href="https://github.com/Sv443/JokeAPI/blob/master/.github/Contributing.md#submitting-translations" target="_blank">Contributing Guide</a>; it will explain it.<br>
+                If you are interested in providing translations, please read the <a href="https://github.com/Sv443-Network/JokeAPI/blob/master/.github/Contributing.md#submitting-translations" target="_blank">Contributing Guide</a>; it will explain it.<br>
                 You can also submit jokes in different languages. Please understand that I will not be able to ensure their proper formatting or legitimacy.<br>
                 <br>
                 Currently available system languages: <mark class="insSysLangs">(Loading...)</mark><br>
@@ -759,7 +759,7 @@ None. It's a hardware problem.
                 Jokes from the category <mark>Dark</mark> are also generally marked as unsafe.<br>
                 <br>
                 Note: this filter is really fine but that doesn't mean human error is out of the question.<br>
-                If you find any jokes that you consider unsafe but are served even when safe mode is activated, please <a href="https://github.com/Sv443/JokeAPI/issues/new/choose" target="_blank">submit an issue here.</a><br>
+                If you find any jokes that you consider unsafe but are served even when safe mode is activated, please <a href="https://github.com/Sv443-Network/JokeAPI/issues/new/choose" target="_blank">submit an issue here.</a><br>
                 <br>
                 The Safe Mode can be enabled by adding the value-less URL parameter <mark>safe-mode</mark> to the URL.<br>
                 <br>
@@ -1558,13 +1558,13 @@ namespace TestHttpRequest
                     <li><a href="https://github.com/AlHood77/Joke_Teller" target="_blank">Joke Teller</a> by <a href="https://github.com/AlHood77" target="_blank">AlHood77</a></li>
                     <li><a href="https://github.com/remcoov/jokes" target="_blank">Jokes plugin for Craft CMS 3.x</a> by <a href="https://github.com/remcoov" target="_blank">remcoov</a></li>
                     <li><a href="https://github.com/ToastIT-dev/PoshBot.Joker" target="_blank">PoshBot.Joker</a> by <a href="https://github.com/ToastIT-dev" target="_blank">ToastIT-dev</a></li>
-                    <li><a href="https://github.com/Sv443/JokeAPI_ComputerCraft" target="_blank">JokeAPI_ComputerCraft</a> by <a href="https://github.com/Sv443" target="_blank">Sv443</a></li>
+                    <li><a href="https://github.com/Sv443-Network/JokeAPI_ComputerCraft" target="_blank">JokeAPI_ComputerCraft</a> by <a href="https://github.com/Sv443" target="_blank">Sv443</a></li>
                     <li><a href="https://github.com/jonathanbossenger/devdadjokes" target="_blank">Dev Dad Jokes</a> by <a href="https://github.com/jonathanbossenger" target="_blank">Jonathan Bossenger</a></li>
 
                     <!-- <li><a href="xyz" target="_blank">xyz</a> by <a href="https://github.com/xyz" target="_blank">xyz</a></li> -->
                 </ul>
                 <br>
-                (<a href="https://github.com/Sv443/JokeAPI/issues/new/choose" target="_blank">Submit an issue</a> to get your project added here)
+                (<a href="https://github.com/Sv443-Network/JokeAPI/issues/new/choose" target="_blank">Submit an issue</a> to get your project added here)
 
 
                 <!-- #MARKER Legal Stuff -->

+ 3 - 3
package.json

@@ -3,7 +3,7 @@
   "version": "2.3.2",
   "description": "A REST API that serves jokes from many categories while also offering a lot of filtering methods",
   "main": "JokeAPI.js",
-  "homepage": "https://jokeapi.dev",
+  "homepage": "https://v2.jokeapi.dev",
   "scripts": {
     "start": "node JokeAPI",
     "test": "node tools/test",
@@ -30,7 +30,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Sv443/JokeAPI.git"
+    "url": "git+https://git.sv443.net/sv443/JokeAPI-v2.git"
   },
   "keywords": [
     "api",
@@ -87,7 +87,7 @@
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/Sv443/JokeAPI/issues/new/choose",
+    "url": "https://github.com/Sv443-Network/JokeAPI/issues/new/choose",
     "email": "[email protected]"
   },
   "engines": {

+ 2 - 2
settings.js

@@ -23,7 +23,7 @@ const settings = {
     info: {
         name: getProp("name"),                      // the name of JokeAPI
         desc: packageJSON.description,                  // the description of JokeAPI
-        projGitHub: "https://github.com/Sv443/JokeAPI", // URL to the project's GitHub page
+        projGitHub: "https://github.com/Sv443-Network/JokeAPI", // URL to the project's GitHub page
         version: packageJSON.version,                   // the version as a string
         versionInt: packageJSON.version.split("."),     // the version as a number array
         docsURL: getProp("baseUrl"),                    // the URL to the documentation of JokeAPI
@@ -34,7 +34,7 @@ const settings = {
             github: `https://github.com/${packageJSON.author.name}`, // author github page
         },
         privacyPolicyUrl: "https://sv443.net/privacypolicy/en",
-        contribGuideUrl: "https://github.com/Sv443/JokeAPI/blob/master/.github/Contributing.md",
+        contribGuideUrl: "https://github.com/Sv443-Network/JokeAPI/blob/master/.github/Contributing.md",
     },
     wrapper: {
         mainFilePath: "./src/main.js",          // main script file

+ 2 - 2
tools/generate-changelog.js

@@ -86,12 +86,12 @@ function writeMD(
             // convert issue references to links
             .replace(
                 /issue #(\d{1,})/g,
-                "[issue #$1](https://github.com/Sv443/JokeAPI/issues/$1)"
+                "[issue #$1](https://github.com/Sv443-Network/JokeAPI/issues/$1)"
             )
             // convert pull request references to links
             .replace(
                 /PR #(\d{1,})/g,
-                "[pull request #$1](https://github.com/Sv443/JokeAPI/pull/$1)"
+                "[pull request #$1](https://github.com/Sv443-Network/JokeAPI/pull/$1)"
             )
         + `<br><br><br>\n\nThis file was auto-generated from the source file at [./${options.SOURCE_FILE}](./${options.SOURCE_FILE})`
     );

+ 1 - 1
tools/submissions.js

@@ -3,7 +3,7 @@
  * 
  * @author Sv443
  * @since 2.3.2
- * @ref #340 - https://github.com/Sv443/JokeAPI/issues/340
+ * @ref #340 - https://github.com/Sv443-Network/JokeAPI/issues/340
  */
 
 const { readdir, readFile, writeFile, copyFile, rm, rmdir } = require("fs-extra");