pstream is dead; long live pstream
taciturnaxolotl.github.io/pstream-ng/
docs: update readme and license
+20
-43
+1
-1
LICENSE.md
+1
-1
LICENSE.md
+19
-42
README.md
+19
-42
README.md
···
1
-
# P-Stream
2
-
3
-
[](https://p-stream.github.io/docs/)
4
-
5
-
## Quick Deploy
6
-
7
-
[](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fp-stream%2Fp-stream)
1
+
# pstream-ng
8
2
9
-
[](https://deploy.workers.cloudflare.com/?url=https://github.com/p-stream/p-stream)
3
+
A fork of [P-Stream](https://github.com/p-stream/p-stream), a media streaming frontend that was [shut down under pressure from ACE/MPA](https://torrentfreak.com/pirate-streaming-portal-p-stream-shuts-down-following-ace-mpa-pressure/). This fork preserves the open-source codebase with merged community contributions and dependency updates.
10
4
11
-
**NOTE: To self-host, more setup is required. Check the [docs](https://p-stream.github.io/docs/) to properly set up!!!!**
5
+
> [!WARNING]
6
+
> **This software does not host, index, or distribute any copyrighted content.** It is a frontend application that interacts with user-configured backends. How it is used is entirely the responsibility of the end user.
12
7
13
-
## Links And Resources
14
-
15
-
| Service | Link | Source Code |
16
-
| ------------- | ----------------------------------------------- | ------------------------------------------------------- |
17
-
| P-Stream Docs | [docs](https://p-stream.github.io/docs/) | [source code](https://github.com/p-stream/docs) |
18
-
| Extension | [extension](https://p-stream.github.io/docs/extension) | [source code](https://github.com/p-stream/browser-ext) |
19
-
| Proxy | [simple-proxy](https://p-stream.github.io/docs/proxy) | [source code](https://github.com/p-stream/simple-proxy) |
20
-
| Backend | [backend](https://github.com/p-stream/backend) | [source code](https://github.com/p-stream/backend) |
21
-
| Frontend | [P-Stream](https://p-stream.github.io/docs/instances) | [source code](https://github.com/p-stream/p-stream) |
22
-
| Weblate | [weblate](https://p-stream.github.io/docs/weblate) | |
23
-
24
-
## Referrers
25
-
26
-
- [FMHY (Voted as #1 streaming site of 2024, 2025)](https://fmhy.net)
8
+
The canonical repo for this is hosted on tangled over at [`dunkirk.sh/pstream-ng`](https://tangled.org/dunkirk.sh/pstream-ng)
27
9
28
10
## Running Locally
29
11
30
-
Type the following commands into your terminal / command line to run P-Stream locally
31
-
32
12
```bash
33
-
git clone https://github.com/p-stream/p-stream.git
34
-
cd smov
35
-
git pull
13
+
git clone git@knot.dunkirk.sh:dunkirk.sh/pstream-ng
14
+
cd pstream-ng
36
15
pnpm install
37
16
pnpm run dev
38
17
```
39
18
40
-
Then you can visit the local instance [here](http://localhost:5173) or, at local host on port 5173.
19
+
Then visit [localhost:5173](http://localhost:5173).
41
20
42
-
## Updating a P-Stream Instance
21
+
## Upstream
43
22
44
-
To update a P-Stream instance you can type the below commands into a terminal at the root of your project.
23
+
To pull in updates from the original P-Stream repo:
45
24
46
25
```bash
47
-
git remote add upstream https://github.com/p-stream/p-stream.git
48
-
git fetch upstream # Grab the contents of the new remote source
49
-
git checkout <YOUR_MAIN_BRANCH> # Most likely this would be `origin/production`
26
+
git fetch upstream
50
27
git merge upstream/production
51
-
# * Fix any conflicts present during merge *
52
-
git add . # Add all changes made during merge and conflict fixing
53
-
git commit -m "Update p-stream instance (merge upstream/production)"
54
-
git push # Push to YOUR repository
55
28
```
56
29
57
-
## Contact Me / Fluxer
30
+
<p align="center">
31
+
<img src="https://raw.githubusercontent.com/taciturnaxolotl/carriage/main/.github/images/line-break.svg" />
32
+
</p>
58
33
59
-
[Fluxer](https://fluxer.gg/rEBQ3B8E)
60
-
61
-
(Fluxer is an OSS Discord alternative platform)
34
+
<p align="center">
35
+
<a href="https://github.com/p-stream/p-stream">
36
+
<img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Fork+of&message=P-Stream&logoColor=d9e0ee&colorA=363a4f&colorB=b7bdf8"/>
37
+
</a>
38
+
</p>