Undo changes for the GitLab integration

9 files changed, 47 insertions, 62 deletions

diff --git a/archives/index.php b/archives/index.php
index 754c89e..8ce16d7 100644
--- a/archives/index.php
+++ b/archives/index.php
@@ -1,9 +1,4 @@
-<?php $title = "Archives"; require $_SERVER['DOCUMENT_ROOT'] . "/includes/main.php"; require $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php";
-
-require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/Parsedown.php";
-$Parsedown = new Parsedown();
-
-?>
+<?php $title = "Archives"; require $_SERVER['DOCUMENT_ROOT'] . "/includes/main.php"; require $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php"; ?>
 
 <div class="container">
     <br><br>
@@ -18,13 +13,13 @@ $Parsedown = new Parsedown();
             <span style="vertical-align: middle;" class="project-span-desktop">
                 <?= $archive["name"] ?>
                 <?php if (trim($archive["description"]) !== ""): ?>
-                <span class="text-muted">· <?= $Parsedown->line(preg_replace("/\[[^\]]*]\([^)]*\)/m", "", $archive["description"])) ?></span>
+                <span class="text-muted">· <?= $archive["description"] ?></span>
                 <?php endif; ?>
             </span>
             <span style="vertical-align: middle;display: none;" class="project-span-mobile">
                 <?= $archive["name"] ?>
                 <?php if (trim($archive["description"]) !== ""): ?>
-                    <span class="text-muted"><br><?= $Parsedown->line(preg_replace("/\[[^\]]*]\([^)]*\)/m", "", $archive["description"])) ?></span>
+                    <span class="text-muted"><br><?= $archive["description"] ?></span>
                 <?php endif; ?>
             </span>
             <span class="text-muted project-date" style="float: right;"><?= timeAgo($archive["date"]) ?> (<?= date('M Y', $archive["date"]) ?>)</span>
diff --git a/archives/old/minteck-mprjnet1.json b/archives/old/minteck-mprjnet1.json
index bd2fde7..03e0f00 100755
--- a/archives/old/minteck-mprjnet1.json
+++ b/archives/old/minteck-mprjnet1.json
@@ -1,5 +1,5 @@
 {

-    "title": "Minteck Projects.net - WebV1",

+    "title": "Minteck Projects.net (WebV1)",

     "date": "12/2018",

     "unreleased": false,

     "description": {

diff --git a/archives/old/minteck-mprjnet3.json b/archives/old/minteck-mprjnet3.json
index 691fd2b..404ece0 100755
--- a/archives/old/minteck-mprjnet3.json
+++ b/archives/old/minteck-mprjnet3.json
@@ -1,5 +1,5 @@
 {

-    "title": "Minteck Projects.net - WebV3",

+    "title": "Minteck Projects.net (WebV3)",

     "date": "05/2019",

     "unreleased": false,

     "description": {

diff --git a/archives/old/minteck-mprjnet5.json b/archives/old/minteck-mprjnet5.json
index dbffc92..1d06168 100755
--- a/archives/old/minteck-mprjnet5.json
+++ b/archives/old/minteck-mprjnet5.json
@@ -1,5 +1,5 @@
 {

-    "title": "Minteck Projects.net - WebV5",

+    "title": "Minteck Projects.net (WebV5)",

     "date": "12/2019",

     "unreleased": false,

     "description": {

diff --git a/archives/old/minteck-polymer3.json b/archives/old/minteck-polymer3.json
index 26e1c7d..ee967c6 100755
--- a/archives/old/minteck-polymer3.json
+++ b/archives/old/minteck-polymer3.json
@@ -1,5 +1,5 @@
 {

-    "title": "Project Polymer 3 - WebV6",

+    "title": "Minteck Projects.net 6 (Project Polymer 3)",

     "date": "04/2020",

     "unreleased": true,

     "description": {

diff --git a/includes/projects.json b/includes/projects.json
index 2459c02..cbd6a98 100644
--- a/includes/projects.json
+++ b/includes/projects.json
@@ -65,7 +65,7 @@
   "Future-Desktop": "Future Desktop Environment",
   "Game-Launcher": "Game Launcher",
   "WebSpace-Desktop": "Minteck Projects WebSpace (Desktop)",
-  "Website": "Minteck-Projects.net - WebV7",
+  "Website": "Minteck-Projects.net (WebV7)",
   "genealogy": "Familine 4.x Genealogy",
   "tempdisk": "TempDisk",
   "ponycon": "PonyCon Countdown",
diff --git a/includes/refresh.php b/includes/refresh.php
index 8372928..ee312c0 100644
--- a/includes/refresh.php
+++ b/includes/refresh.php
@@ -5,73 +5,65 @@ $equivalents = json_decode(file_get_contents("./projects.json"), true);
 $descriptions = json_decode(file_get_contents("./descriptions.json"), true);
 $projects = [];
 
-print("GitLab > equestria.dev\n");
-$gitlab = json_decode(file_get_contents("https://invent.equestria.dev/api/v4/groups/5/projects?include_subgroups=true"), true);
+print("Gitea > equestria.dev\n");
+$gitea = json_decode(file_get_contents("https://git.equestria.dev/api/v1/orgs/equestria.dev/repos?limit=1000"), true);
 
-foreach ($gitlab as $project) {
-    print("    " . $project["path"] . "\n");
-    $languages = json_decode(file_get_contents("https://invent.equestria.dev/api/v4/projects/$project[id]/languages"), true);
-
-    $files = json_decode(file_get_contents("https://invent.equestria.dev/api/v4/projects/$project[id]/repository/tree"), true);
+foreach ($gitea as $project) {
+    print("    " . $project["name"] . "\n");
+    $languages = json_decode(file_get_contents("https://git.equestria.dev/api/v1/repos/equestria.dev/$project[name]/languages"), true);
 
-    $readme = null;
-    foreach ($files as $file) { if (strtolower($file["name"]) === "readme.md") {
-        $readme = "https://invent.equestria.dev/api/v4/projects/$project[id]/repository/blobs/$file[id]";
-    }}
+    $readme_dl = json_decode(file_get_contents("https://git.equestria.dev/api/v1/repos/equestria.dev/$project[name]/contents/README.md"), true);
+    $commit = json_decode(file_get_contents("https://git.equestria.dev/api/v1/repos/equestria.dev/$project[name]/commits?limit=1"), true)[0];
 
-    $commit = json_decode(file_get_contents("https://invent.equestria.dev/api/v4/projects/$project[id]/repository/commits"), true)[0];
+    if (isset($readme_dl)) {
+        $readme = base64_decode($readme_dl["content"]);
+    } else {
+        $readme = null;
+    }
 
     $projects[] = [
-        "id" => md5("equestria.dev/" . $project["path"]),
+        "id" => md5("equestria.dev/" . $project["id"]),
         "owner" => "equestria.dev",
-        "name" => $project["path"],
-        "display_name" => $project["name"],
+        "name" => $project["name"],
+        "display_name" => $equivalents[$project["name"]] ?? $project["name"],
         "description" => $descriptions[$project["name"]] ?? $project["description"],
-        "source" => $project["web_url"],
-        "icon" => trim($project["avatar_url"] ?? "") === "" ? null : $project["avatar_url"],
-        "website" => preg_replace("/(.*)\[\]\((http(s|):\/\/([^ ]*))\)(.*)/m", "$2", $project["description"]) !== $project["description"] ? preg_replace("/(.*)\[\]\((http(s|):\/\/([^ ]*))\)(.*)/m", "$2", $project["description"]) : $project["web_url"],
-        "size" => 0,
+        "source" => $project["html_url"],
+        "icon" => trim($project["avatar_url"]) === "" ? null : $project["avatar_url"],
+        "website" => trim($project["website"]) === "" ? $project["html_url"] : $project["website"],
+        "size" => $project["size"],
         "language" => array_keys($languages)[0] ?? null,
         "languages" => $languages,
-        "update" => strtotime($project["last_activity_at"]),
-        "commit" => isset($commit) ? strtotime($commit["created_at"]) : strtotime($project["last_activity_at"]),
+        "update" => strtotime($project["updated_at"]),
+        "commit" => isset($commit) ? strtotime($commit["created"]) : strtotime($project["updated_at"]),
         "archive" => $project["archived"],
         "readme" => $readme
     ];
 }
 
-print("Gitlab > minteck.org\n");
-$minteckorg = json_decode(file_get_contents("https://invent.equestria.dev/api/v4/groups/44/projects?include_subgroups=true"), true);
-
-foreach ($minteckorg as $project) {
-    print("    " . $project["path"] . "\n");
-    $languages = json_decode(file_get_contents("https://invent.equestria.dev/api/v4/projects/$project[id]/languages"), true);
+print("Gitea > minteck.org\n");
 
-    $files = json_decode(file_get_contents("https://invent.equestria.dev/api/v4/projects/$project[id]/repository/tree"), true);
+$minteckorg = json_decode(file_get_contents("https://git.equestria.dev/api/v1/orgs/minteck.org/repos?limit=1000"), true);
 
-    $readme = null;
-    foreach ($files as $file) { if (strtolower($file["name"]) === "readme.md") {
-        $readme = "https://invent.equestria.dev/api/v4/projects/$project[id]/repository/blobs/$file[id]";
-    }}
+foreach ($minteckorg as $project) {
+    print("    " . $project["name"] . "\n");
+    $languages = json_decode(file_get_contents("https://git.equestria.dev/api/v1/repos/minteck.org/$project[name]/languages"), true);
 
-    $commit = json_decode(file_get_contents("https://invent.equestria.dev/api/v4/projects/$project[id]/repository/commits"), true)[0];
+    $commit = json_decode(file_get_contents("https://git.equestria.dev/api/v1/repos/minteck.org/$project[name]/commits?limit=1"), true)[0];
 
     $projects[] = [
-        "id" => md5("minteck.org-gitea/" . $project["path"]),
+        "id" => md5("minteck.org-gitea/" . $project["id"]),
         "owner" => "minteck.org-gitea",
-        "name" => $project["path"],
-        "display_name" => $project["name"],
+        "name" => $project["name"],
+        "display_name" => $equivalents[$project["name"]] ?? $project["name"],
         "description" => $descriptions[$project["name"]] ?? $project["description"],
-        "source" => $project["web_url"],
-        "icon" => trim($project["avatar_url"] ?? "") === "" ? null : $project["avatar_url"],
-        "website" => preg_replace("/(.*)\[\]\((http(s|):\/\/([^ ]*))\)(.*)/m", "$2", $project["description"]) !== $project["description"] ? preg_replace("/(.*)\[\]\((http(s|):\/\/([^ ]*))\)(.*)/m", "$2", $project["description"]) : $project["web_url"],
-        "size" => 0,
+        "source" => $project["html_url"],
+        "icon" => trim($project["avatar_url"]) === "" ? null : $project["avatar_url"],
+        "website" => trim($project["website"]) === "" ? $project["html_url"] : $project["website"],
+        "size" => $project["size"],
         "language" => array_keys($languages)[0] ?? null,
         "languages" => $languages,
-        "update" => strtotime($project["last_activity_at"]),
-        "commit" => isset($commit) ? strtotime($commit["created_at"]) : strtotime($project["last_activity_at"]),
-        "archive" => $project["archived"],
-        "readme" => $readme
+        "update" => strtotime($project["updated_at"]),
+        "commit" => isset($commit) ? strtotime($commit["created"]) : strtotime($project["updated_at"])
     ];
 }
 
diff --git a/includes/version.txt b/includes/version.txt
index 4aba93d..846602d 100644
--- a/includes/version.txt
+++ b/includes/version.txt
@@ -1 +1 @@
-12.1.5
\ No newline at end of file
+12.1.3
\ No newline at end of file
diff --git a/projects/index.php b/projects/index.php
index 3998f6a..53e9841 100644
--- a/projects/index.php
+++ b/projects/index.php
@@ -1,7 +1,5 @@
 <?php $title = "Projects"; require $_SERVER['DOCUMENT_ROOT'] . "/includes/main.php";
 
-require_once $_SERVER['DOCUMENT_ROOT'] . "/includes/Parsedown.php";
-$Parsedown = new Parsedown();
 $base = array_keys($_GET)[0] ?? null;
 
 if (isset($base)) {
@@ -45,7 +43,7 @@ require $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php";
             ?>
             <?php else: ?>
             <h1><?= $project["display_name"] ?></h1>
-            <p><?= trim($project["description"]) === "" ? "<span class='text-muted'>This project does not have a description.</span>" : $Parsedown->line(preg_replace("/\[[^\]]*]\([^)]*\)/m", "", $project["description"])) ?></p>
+            <p><?= trim($project["description"]) === "" ? "<span class='text-muted'>This project does not have a description.</span>" : strip_tags($project["description"]) ?></p>
             <?php endif; ?>
             <script>
                 document.querySelectorAll("#project-description table").forEach((i) => {
@@ -133,7 +131,7 @@ require $_SERVER['DOCUMENT_ROOT'] . "/includes/header.php";
                         </div>
 
                         <div class="fancy-card-body">
-                            <p><?= trim($project["description"]) === "" ? "<span class='text-muted'>This project does not have a description.</span>" : $Parsedown->line(preg_replace("/\[[^\]]*]\([^)]*\)/m", "", $project["description"])) ?></p>
+                            <p><?= trim($project["description"]) === "" ? "<span class='text-muted'>This project does not have a description.</span>" : strip_tags($project["description"]) ?></p>
                         </div>
 
                         <div class="fancy-card-footer">