Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: LBRYFoundation/Watch-on-LBRY
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.4
Choose a base ref
...
head repository: LBRYFoundation/Watch-on-LBRY
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Feb 5, 2020

  1. popup ui

    adam-dorin committed Feb 5, 2020
    Copy the full SHA
    1dfd23f View commit details
  2. Copy the full SHA
    afee0d5 View commit details

Commits on Feb 6, 2020

  1. Merge pull request #14 from adam-dorin/master

    Popup improved
    kodxana authored Feb 6, 2020
    Copy the full SHA
    07e6f4d View commit details
  2. Version UP

    kodxana authored Feb 6, 2020
    Copy the full SHA
    9ca4153 View commit details

Commits on Mar 16, 2020

  1. add attribution

    kauffj authored Mar 16, 2020
    Copy the full SHA
    888e52a View commit details
  2. Merge pull request #15 from kauffj/patch-1

    add attribution
    kodxana authored Mar 16, 2020
    Copy the full SHA
    473f8d2 View commit details
  3. Update manifest.json

    kodxana authored Mar 16, 2020
    Copy the full SHA
    ae6c995 View commit details

Commits on May 29, 2020

  1. Update README.md

    kodxana authored May 29, 2020
    Copy the full SHA
    763060a View commit details

Commits on Jul 5, 2020

  1. Remove cors-anywhere

    FireMasterK committed Jul 5, 2020
    Copy the full SHA
    834ca65 View commit details

Commits on Jul 6, 2020

  1. Merge pull request #18 from StuffNoOneCaresAbout/master

    Remove cors-anywhere
    kodxana authored Jul 6, 2020
    Copy the full SHA
    2f91e32 View commit details

Commits on Jul 14, 2020

  1. Up version

    - Up to version 1.5
    - Added YTtoLBRY
    kodxana authored Jul 14, 2020
    Copy the full SHA
    3b64289 View commit details
  2. Added YTtoLBRY

    Added tool to convert YouTube subscription to LBRY
    kodxana authored Jul 14, 2020
    Copy the full SHA
    77d6476 View commit details
  3. Added new button to popup

    kodxana authored Jul 14, 2020
    Copy the full SHA
    cc2d4f4 View commit details
  4. invidio.us support

    kodxana authored Jul 14, 2020
    Copy the full SHA
    e3eeff4 View commit details
  5. Copy the full SHA
    62ac4e6 View commit details
  6. Add files via upload

    kodxana authored Jul 14, 2020
    Copy the full SHA
    3799bd1 View commit details
  7. Changed line 85

    kodxana authored Jul 14, 2020
    Copy the full SHA
    bb1a8d6 View commit details
  8. Minor changes

    kbakdev committed Jul 14, 2020
    Copy the full SHA
    35ef6d9 View commit details
  9. Create LICENSE

    kodxana authored Jul 14, 2020
    Copy the full SHA
    b5c29c4 View commit details
  10. Merge pull request #22 from kodxana/add-license-1

    Create LICENSE
    kodxana authored Jul 14, 2020
    Copy the full SHA
    0eded90 View commit details

Commits on Jul 15, 2020

  1. Improved graphics

    Changed HTML and CSS
    kbakdev committed Jul 15, 2020
    Copy the full SHA
    0d373e6 View commit details
  2. Update YTtoLBRY.html

    kodxana authored Jul 15, 2020
    Copy the full SHA
    928849e View commit details
  3. Merge pull request #23 from 53jk1/master

    Improved graphics
    kodxana authored Jul 15, 2020
    Copy the full SHA
    7128d6f View commit details

Commits on Jul 24, 2020

  1. Copy the full SHA
    555898a View commit details

Commits on Aug 10, 2020

  1. Merge pull request #25 from clay53/a-redirect

    lbry.tv links now redirect to lbry app
    kodxana authored Aug 10, 2020
    Copy the full SHA
    713105c View commit details
  2. Copy the full SHA
    54afaa8 View commit details
  3. Update README.md

    kodxana authored Aug 10, 2020
    Copy the full SHA
    e82cce7 View commit details

Commits on Aug 11, 2020

  1. Copy the full SHA
    5f5b2a8 View commit details
  2. Merge pull request #26 from clay53/lbrytv-app-close

    Better handling for redirection to app from lbry.tv links & small cleanup
    kodxana authored Aug 11, 2020
    Copy the full SHA
    b2c1fd3 View commit details
  3. Update manifest.json

    kodxana authored Aug 11, 2020
    Copy the full SHA
    fa060b1 View commit details
  4. Update manifest.json

    kodxana authored Aug 11, 2020
    Copy the full SHA
    bf7f112 View commit details

Commits on Oct 6, 2020

  1. npm style project setup

    * All files were moved to the `src` directory, unchanged
    * Parcel handles module resolution as well as transpilation via babel
    * package.json, package-lock.json, and .gitignore were added
    * Utilize crossplatform tools for build
    Aenigma committed Oct 6, 2020
    Copy the full SHA
    0cc8f4e View commit details
  2. Remove content.js script include

    Since that scripts doesn't exist, it breaks the parcel build
    Aenigma committed Oct 6, 2020
    Copy the full SHA
    4a8fcab View commit details
  3. Copy the full SHA
    d569954 View commit details
  4. Fix run scripts for windows

    Apparently, windows doesn't like single quotes in some cases.
    Aenigma committed Oct 6, 2020
    Copy the full SHA
    cb59fc5 View commit details

Commits on Oct 8, 2020

  1. Merge pull request #31 from Aenigma/feature/npm-project

    npm style project setup
    kodxana authored Oct 8, 2020
    Copy the full SHA
    b08a6a2 View commit details
  2. Update package.json

    kodxana authored Oct 8, 2020
    Copy the full SHA
    83f4a06 View commit details
  3. Bump node-forge from 0.7.6 to 0.10.0

    Bumps [node-forge](https://github.com/digitalbazaar/forge) from 0.7.6 to 0.10.0.
    - [Release notes](https://github.com/digitalbazaar/forge/releases)
    - [Changelog](https://github.com/digitalbazaar/forge/blob/master/CHANGELOG.md)
    - [Commits](digitalbazaar/forge@0.7.6...0.10.0)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Oct 8, 2020
    Copy the full SHA
    fcd5a5a View commit details
  4. Merge pull request #32 from LBRYFoundation/dependabot/npm_and_yarn/no…

    …de-forge-0.10.0
    
    Bump node-forge from 0.7.6 to 0.10.0
    kodxana authored Oct 8, 2020
    Copy the full SHA
    ebecd0c View commit details

Commits on Oct 13, 2020

  1. Added typescript

    Aenigma committed Oct 13, 2020
    Copy the full SHA
    468c04b View commit details
  2. Common settings module

    * settings module as single source of truth and provides utilities,
      defaults, constants, and typing
    * runtimeOnStartup and storageOnChanged were merged into storageSetup
    * storageSetup reworked to use settings for seamless additions
    * tabOnUpdated and YTtoLBRY updated to use settings for URL prefixes
    Aenigma committed Oct 13, 2020
    Copy the full SHA
    48f88da View commit details
  3. ytService and rewrite of YTtoLBRY

    YTtoLBRY:
    
    * Use DOMParser for reading OPML
      * OPML parsing was quite brittle as it relied on string parsing
    * Removed dead script inclusion in the HTML page
    * Removed global state variables
    * Use fetch to clean up the query logic
    * Promisified file, API calls, and settings querying to simplify logic
    
    Many of the utilities involving APIs were isolated to a common module.
    Particularly, ytService contains all methods for extracting IDs,
    querying for the lbry URLs, parsing OPML, and more.
    
    This functionally is heavily used in YTtoLBRY and lightly used by
    tabsOnUpdated.
    Aenigma committed Oct 13, 2020
    Copy the full SHA
    da5cc12 View commit details
  4. URL parsing for app redirects

    URL parsing logic is basically a straight port of how lbryio/lbry-sdk
    parses lbry URLs. While there's a lot more going on, it should be
    easier to follow what they're doing this way.
    
    Also, added some light unit tests for the URL parsing using jest.
    Which, of course, needed a babel config.
    
    With this, tabOnUpdated was able to be rewritten more elegantly to
    handle redirects as it delegates a lot of the work to utilities now.
    Aenigma committed Oct 13, 2020
    Copy the full SHA
    9f8e521 View commit details
  5. Use preact + sass for popup

    * Styles were extracted out from popup.css and into common/style
    * Preact allows for reusable components and easier dynamic components
      * Easy transition to react or others while not being overbearing
    * Component specific style are locally imported and handled by parcel
    
    ButtonRadio is particulary nice in that it uses pre-exisitng button
    styling on radio buttons to make it easy to pick configurable options.
    Aenigma committed Oct 13, 2020
    Copy the full SHA
    6e907c9 View commit details
  6. Make YTtoLBRY use Preact

    Not particularly valuable here, but more consistent if we're to accept
    popup as using preact
    Aenigma committed Oct 13, 2020
    Copy the full SHA
    69f24a6 View commit details
  7. Add odysee

    Aenigma committed Oct 13, 2020
    Copy the full SHA
    3821ff8 View commit details
  8. Bug fixes

    Subscription converter didn't handle error responses very well.
    Also, the chunk size was lowered to 300 as this seems to make requests
    failing.
    
    Additionally, fix bug where redirect was trying to go to the app and a frontend at the same time, only to confuse lbry.tv
    Aenigma committed Oct 13, 2020
    Copy the full SHA
    deac83e View commit details
  9. Merge pull request #34 from Aenigma/feature/rewrite

    Major Refactor
    kodxana authored Oct 13, 2020
    Copy the full SHA
    2d71984 View commit details
  10. Up Version

    kodxana authored Oct 13, 2020
    Copy the full SHA
    df18a83 View commit details
  11. Merge pull request #35 from LBRYFoundation/Up-Version

    Up Version
    kodxana authored Oct 13, 2020
    Copy the full SHA
    7ae45e5 View commit details
Showing with 31,238 additions and 160 deletions.
  1. +16 −0 .devcontainer/Dockerfile
  2. +36 −0 .devcontainer/devcontainer.json
  3. +4 −0 .github/FUNDING.yml
  4. +23 −0 .github/workflows/contributors.yml
  5. +37 −0 .github/workflows/extension-build.js.yml
  6. +8 −0 .gitignore
  7. +15 −0 CHANGELOG.md
  8. +674 −0 LICENSE
  9. +118 −13 README.md
  10. +6 −0 babel.config.js
  11. BIN doc/img/AMO-button_1.png
  12. BIN doc/img/chrome-small-border.png
  13. +9 −0 global.d.ts
  14. BIN icons/icon128.png
  15. BIN icons/icon16.png
  16. BIN icons/icon48.png
  17. +192 −0 jest.config.js
  18. +0 −28 manifest.json
  19. +56 −0 manifest.v2.json
  20. +59 −0 manifest.v3.json
  21. +17,498 −0 package-lock.json
  22. +50 −0 package.json
  23. +0 −9 popup/popup.css
  24. +0 −22 popup/popup.html
  25. +0 −19 popup/popup.js
  26. +0 −12 scripts/runtimeOnStartup.js
  27. +0 −7 scripts/storageOnChanged.js
  28. +0 −50 scripts/tabOnUpdated.js
  29. +79 −0 src/assets/icons/lbry/lbry-logo.svg
  30. +38 −0 src/assets/icons/lbry/madiator-logo.svg
  31. +151 −0 src/assets/icons/lbry/odysee-logo.svg
  32. +1 −0 src/assets/icons/wol/default-monochrome-black.svg
  33. +1 −0 src/assets/icons/wol/default-monochrome-white.svg
  34. +1 −0 src/assets/icons/wol/default-transparent.svg
  35. +1 −0 src/assets/icons/wol/default.svg
  36. BIN src/assets/icons/wol/icon128.png
  37. BIN src/assets/icons/wol/icon16.png
  38. BIN src/assets/icons/wol/icon48.png
  39. +1 −0 src/assets/icons/wol/isolated-layout.svg
  40. +1 −0 src/assets/icons/wol/isolated-monochrome-black.svg
  41. +1 −0 src/assets/icons/wol/isolated-monochrome-white.svg
  42. +158 −0 src/assets/styles/common.css
  43. +142 −0 src/components/dialogs.tsx
  44. +200 −0 src/modules/crypto/index.ts
  45. +15 −0 src/modules/file/index.ts
  46. +83 −0 src/modules/yt/index.ts
  47. +82 −0 src/modules/yt/urlCache.ts
  48. +88 −0 src/modules/yt/urlResolve.ts
  49. +17 −0 src/pages/YTtoLBRY/index.html
  50. +86 −0 src/pages/YTtoLBRY/main.tsx
  51. +86 −0 src/pages/YTtoLBRY/style.css
  52. +14 −0 src/pages/import/index.html
  53. +62 −0 src/pages/import/main.tsx
  54. +35 −0 src/pages/import/style.css
  55. +14 −0 src/pages/popup/index.html
  56. +236 −0 src/pages/popup/main.tsx
  57. +55 −0 src/pages/popup/style.css
  58. +36 −0 src/scripts/background.ts
  59. +363 −0 src/scripts/ytContent.tsx
  60. +2 −0 src/service-worker-entry-point.ts
  61. +33 −0 src/settings/background.ts
  62. +201 −0 src/settings/index.ts
  63. +71 −0 tsconfig.json
  64. +10,083 −0 yarn.lock
16 changes: 16 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/typescript-node/.devcontainer/base.Dockerfile

# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
ARG VARIANT="16-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

# [Optional] Uncomment if you want to install an additional version of node using nvm
# ARG EXTRA_NODE_VERSION=10
# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"

# [Optional] Uncomment if you want to install more global node packages
# RUN su node -c "npm install -g <your-package-list -here>"
36 changes: 36 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/typescript-node
{
"name": "Node.js & TypeScript",
"build": {
"dockerfile": "Dockerfile",
// Update 'VARIANT' to pick a Node version: 16, 14, 12.
// Append -bullseye or -buster to pin to an OS version.
// Use -bullseye variants on local on arm64/Apple Silicon.
"args": {
"VARIANT": "14-bullseye"
}
},
// Set *default* container specific settings.json values on container create.
"settings": {
"javascript.format.placeOpenBraceOnNewLineForControlBlocks": false,
"javascript.format.placeOpenBraceOnNewLineForFunctions": false,
"typescript.format.placeOpenBraceOnNewLineForControlBlocks": false,
"typescript.format.placeOpenBraceOnNewLineForFunctions": false
},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"bierner.folder-source-actions",
"jbockle.jbockle-format-files",
"eamodio.gitlens"
],
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "npm install",
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "node",
"features": {
"python": "latest"
}
}
4 changes: 4 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# These are supported funding model platforms

liberapay: Madiator2011
custom: cointr.ee/madiator2011
23 changes: 23 additions & 0 deletions .github/workflows/contributors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Add contributors
on:
schedule:
- cron: '20 20 * * *'
push:
branches:
- master

jobs:
add-contributors:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: BobAnkh/add-contributors@master
with:
CONTRIBUTOR: '## Contributors'
COLUMN_PER_ROW: '6'
ACCESS_TOKEN: ${{secrets.GITHUB_TOKEN}}
IMG_WIDTH: '100'
FONT_SIZE: '14'
PATH: '/README.md'
COMMIT_MESSAGE: 'docs(README): update contributors'
AVATAR_SHAPE: 'round'
37 changes: 37 additions & 0 deletions .github/workflows/extension-build.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [15.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: yarn
- run: npm run build
- run: npm run
- run: npm run build:webext
- name: Archive extension directory
uses: actions/upload-artifact@v2
with:
name: extension
path: |
dist
web-ext-artifacts
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.cache
dist
build
node_modules
web-ext-artifacts
yarn-error.log

.DS_Store
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Changelog

## [1.7.5](https://github.com/LBRYFoundation/Watch-on-LBRY/releases/tag/1.7.5) (2021-12-12)

**Closed issues:**

- Subscription Converter feature doesn't seem to work [\#64](https://github.com/LBRYFoundation/Watch-on-LBRY/issues/64)
- Redirect with timestamp [\#57](https://github.com/LBRYFoundation/Watch-on-LBRY/issues/57)
- Should default to odysee.com instead of lbry.tv [\#53](https://github.com/LBRYFoundation/Watch-on-LBRY/issues/53)
- Instead of redirect. Show a popup from the extension icon [\#38](https://github.com/LBRYFoundation/Watch-on-LBRY/issues/38)

**Merged pull requests:**

- Update ytContent.tsx [\#70](https://github.com/LBRYFoundation/Watch-on-LBRY/pull/70) ([Shiba](https://github.com/DeepDoge))
- Madiator icon added [\#71](https://github.com/LBRYFoundation/Watch-on-LBRY/pull/71) ([Shiba](https://github.com/DeepDoge))
Loading