Skip to content

Commit

Permalink
Revert "Update from Upstream" (#50)
Browse files Browse the repository at this point in the history
* Revert "Fixed lint"

This reverts commit d76d997.

* Revert "Updated hypixelconstants"

This reverts commit 681e2c4.

* Revert "Update arcade games processor (slothpixel#713)"

This reverts commit 3630094.

* Revert "updated hypixelconstants"

This reverts commit f323027.

* Revert "skip linter on build"

This reverts commit a7965a8.

* Revert "removed legacy stuff (slothpixel#705)"

This reverts commit a965cf3.

* Revert "whitelist items route"

This reverts commit d7a9abd.

* Revert "fix skyblock/profiles endpoint returning empty object when uncached on graphql (slothpixel#703)"

This reverts commit 4a33a62.

* Revert "Fix graphql not working with the guilds endpoint (slothpixel#702)"

This reverts commit d5aa338.

* Revert "Fix graphql not working with the guilds endpoint (slothpixel#701)"

This reverts commit 031a596.

* Revert "bump node to 16"

This reverts commit f734801.

* Revert "[experimental] disable sentry"

This reverts commit 3d2a3f4.

* Revert "Fix rank sort function (slothpixel#699)"

This reverts commit 8749c9e.

* Revert "audit fix"

This reverts commit 2330924.

* Revert "Bump @sentry/node from 6.2.0 to 6.12.0 (slothpixel#698)"

This reverts commit 4ba4c22.

* Revert "update hypixelconstants"

This reverts commit 51faccd.

* Revert "Fix tag_formatted rendering when tag is null (slothpixel#696)"

This reverts commit 37634f8.

* Revert "Guild rewrite, fixes slothpixel#690"

This reverts commit 63faa45.

* Revert "fix lint"

This reverts commit da5b6fe.

* Revert "Improvements to the guild and player endpoints (slothpixel#691)"

This reverts commit 122f272.

* Revert "Added new profile endpoint to graphql"

This reverts commit cddd130.

* Revert "Fixed ESLint workflow"

This reverts commit 87d818b.

* Revert "stopatyearend param quick fix (slothpixel#688)"

This reverts commit 6e4e1e3.

* Revert "Added ranked and mega stats (slothpixel#687)"

This reverts commit ba2ff84.

* Revert "Added /skyblock/calendar and /skyblock/events endpoints (slothpixel#683)"

This reverts commit c84b08d.

* Revert "Added more murder mystery stats (slothpixel#685)"

This reverts commit b10fdf0.

* Revert "Added guild achievement stats (slothpixel#682)"

This reverts commit bd5fc22.

* Revert "fix lint"

This reverts commit 704a05d.

* Revert "fix lint"

This reverts commit 5d5b792.

* Revert "Fixed errors and added missing stats (slothpixel#681)"

This reverts commit f858c23.

* Revert "fix: monthlyPackageRank having priority over rank (slothpixel#680)"

This reverts commit 8a0b0f2.

* Revert "Updated SkyWars stats (slothpixel#679)"

This reverts commit 63aae75.

* Revert "Added k_d, w_l, final_k_d and bed_ratio to bedwars gamemodes (slothpixel#678)"

This reverts commit 966824a.

* Revert "Change updateQueue to a Set"

This reverts commit 7e52927.

* Revert "create fixItems"

This reverts commit cd31c31.

* Revert "remove itemlist update call"

This reverts commit ff4c653.

* Revert "Added updateQueue to items"

This reverts commit 47416b5.

* Revert "Fixed 4v4 stats (slothpixel#677)"

This reverts commit 22ad0ea.

* Revert "Create eslint.yml"

This reverts commit 9e17ea0.

* Revert "Fixed Clean name for updated hypixel constants (slothpixel#675)"

This reverts commit a0a167c.

* Revert "Added 4v4 stats for bedwars (slothpixel#673)"

This reverts commit 28d88e8.

* Revert "Support more gamemodes in the /status endpoint (slothpixel#668)"

This reverts commit 94b2862.

* Revert "Add correct bedwars games played (slothpixel#662)"

This reverts commit 8a673dc.

* Revert "Fix minutely rate limit"

This reverts commit 7fb3ed3.

* Revert "Updated skyblock item filter (slothpixel#658)"

This reverts commit 9d72754.

* Revert "Changes to filter for processSkyblock (slothpixel#657)"

This reverts commit 287fdd0.

* Revert "processSkyblock filter change (slothpixel#656)"

This reverts commit d1b9686.

* Revert "Dep updates"

This reverts commit 7a36539.

* Revert "Add 2v2v2v2 and 3v3v3v3 to Bridge stats to Duels (slothpixel#647)"

This reverts commit bc7da5e.

* Revert "Update tiered achievement data (slothpixel#644)"

This reverts commit 96bf035.

* Revert "Don't require MVP+ for MVP++"

This reverts commit 0179d30.

* Revert "Update docs with new parser data (slothpixel#637)"

This reverts commit 5eb7190.

* Revert "sb-parser 0.2.8"

This reverts commit 9a5cc9a.

* Revert "audit fix"

This reverts commit 9d3f665.

* Revert "Reworked skyblock profile processing"

This reverts commit c9772a3.

* Revert "unbreak changes from express-graphql v.0.10.0"

This reverts commit bacbae3.

* Revert "Bump graphql from 14.6.0 to 15.5.0"

This reverts commit 02cb259.

* Revert "Bump ioredis from 4.19.4 to 4.27.2"

This reverts commit 5b089cd.

* Revert "Fixed profile cache not updating"

This reverts commit 154268b.

* Revert "bump hypixelconstants"

This reverts commit 0c291e1.

* Revert "fix linting errors"

This reverts commit c56e86a.

* Revert "change TNT Tag key: TNTAG to TNTTAG"

This reverts commit ef81163.

* Revert "add my uuid"

This reverts commit f19fe51.

* Revert "added naming to party games and tnt tag"

This reverts commit 2afbce6.

* Revert "update hypixelconstants"

This reverts commit d120443.

* Revert "Add the new slayer tier to docs"

This reverts commit 1108fb5.

* Revert "sb-parser 0.2.6"

This reverts commit 70cebc3.

* Revert "Bump express-graphql from 0.9.0 to 0.12.0"

This reverts commit ae23ccd.

* Revert "sb-parser 0.2.5"

This reverts commit b4e744a.

* Revert "sb-parser 0.2.5"

This reverts commit 5174bcc.

* Revert "sb-parser 0.2.5"

This reverts commit a9a940a.

* Revert "minor changes"

This reverts commit 186dd3f.

* Revert "Update buildSkyBlockProfiles.js"

This reverts commit b9e3abf.

* Revert "Update buildSkyBlockProfiles.js"

This reverts commit bd133ac.

* Revert "Update buildSkyBlockProfiles.js"

This reverts commit b9588aa.

* Revert "Append content"

This reverts commit a87e7bc.

* Revert "Add profile name to /skyblock/profile/ endpoint"

This reverts commit fe35a7c.
  • Loading branch information
ChristianDobbie committed Jan 10, 2022
1 parent d76d997 commit 31c1585
Show file tree
Hide file tree
Showing 38 changed files with 1,759 additions and 3,258 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/eslint.yml

This file was deleted.

23 changes: 23 additions & 0 deletions .travis.yml
@@ -0,0 +1,23 @@
sudo: required
language: node_js
services:
- docker
node_js:
- 'node'
notifications:
email:
- olaakkonen@gmail.com
before_install:
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
- sudo apt-get update
- sudo apt-get -y install docker-ce
install: true
script:
- sudo bash scripts/build.sh
deploy:
provider: script
skip_cleanup: true
on:
branch: master
script: chmod +x scripts/postbuild.sh && scripts/postbuild.sh
3 changes: 0 additions & 3 deletions CONTRIBUTORS.js
Expand Up @@ -17,7 +17,4 @@ module.exports = [
'545ee6e50eb444858ee3abc40b04f367', // danktrain
'2cf9d8ca459a4c5cbf8911eeef146d6f', // Mythbusters123
'7c0da4ba54fa40df82309200e69d328e', // ImRodry
'763b4f2684d94edeaf4f61522cd7c1b9', // Squagward
'40d803128602485382a112c60cfe84ae', // MattTheCuber
'4e832e0d14b64f8face2280a9bf9dd98', // TheMysterys
];
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM node:16-alpine
FROM node:12-alpine

RUN apk update && apk add bash && apk add curl && apk add git

Expand Down
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -2,7 +2,9 @@ core
===

[![Discord](https://discordapp.com/api/guilds/323555112553414667/embed.png)](https://discord.gg/ND9bJKK)
[![Build Status](https://travis-ci.org/slothpixel/core.svg?branch=master)](https://travis-ci.org/slothpixel/core)
[![Code Quality](https://img.shields.io/lgtm/grade/javascript/github/slothpixel/core)](https://lgtm.com/projects/g/slothpixel/core)
[![Greenkeeper](https://badges.greenkeeper.io/slothpixel/core.svg)](https://greenkeeper.io)

**NOTE:** The Slothpixel API is currently in early development - some features are missing and/or incomplete.

Expand Down
63 changes: 0 additions & 63 deletions dev/fixItems.js

This file was deleted.

12 changes: 12 additions & 0 deletions dev/insertKeys.js
@@ -0,0 +1,12 @@
/*
* Used to mass insert API keys to redis
*/
const cp = require('child_process');

process.stdin.setRawMode(true);
process.stdin.on('readable', () => {
const keys = JSON.parse(process.stdin.read());
keys.forEach((key) => {
cp.execSync(`redis-cli -x set api_keys:${key.key} ${JSON.stringify(key)}`);
});
});
4 changes: 4 additions & 0 deletions index.js
Expand Up @@ -2,13 +2,17 @@
/**
* Entry point for the application.
* */
const cp = require('child_process');
const pm2 = require('pm2');
const async = require('async');
const { apps } = require('./manifest.json');

const arguments_ = process.argv.slice(2);
const group = arguments_[0] || process.env.GROUP;

if (process.env.PROVIDER === 'gce') {
cp.execSync('curl -H "Metadata-Flavor: Google" -L http://metadata.google.internal/computeMetadata/v1/project/attributes/env > /usr/src/.env');
}
if (process.env.ROLE) {
// if role variable is set just run that script
require(`./svc/${process.env.ROLE}.js`);
Expand Down

0 comments on commit 31c1585

Please sign in to comment.